diff --git a/macros.perl b/macros.perl new file mode 100644 index 0000000..799090d --- /dev/null +++ b/macros.perl @@ -0,0 +1,10 @@ +# Perl specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %include %{_rpmconfigdir}/macros.perl +%__perl /usr/bin/perl +%perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib) +%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch) +%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) +%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) +%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) +%perl_privlib %(eval "`perl -V:installprivlib`"; echo $installprivlib) diff --git a/perl.spec b/perl.spec index 2dbf8c5..987dd7a 100644 --- a/perl.spec +++ b/perl.spec @@ -28,7 +28,7 @@ Name: perl Version: 5.24.4 -Release: 3mamba +Release: 6mamba Epoch: 2 Summary: Practical Extraction and Report Language Group: Development/Libraries/Perl @@ -37,6 +37,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: http://www.perl.com Source: http://www.cpan.org/src/%{MAJver}.0/perl-%{version}.tar.gz +Source1: macros.perl Patch0: %{name}-5.10.1-norootcheck.patch Patch1: %{name}-5.8.7-can_2005_0448.patch Patch2: %{name}-5.8.7-can_2005_3962.patch @@ -69,35 +70,35 @@ Provides: perl(timelocal.pl) Provides: perl(Carp::Heavy) Obsoletes: perl-Test-Builder-Tester Provides: perl-Archive-Tar -Obsoletes: perl-Archive-Tar +Obsoletes: perl-Archive-Tar < 2:5.24 #Provides: perl-Module-Build #Obsoletes: perl-Module-Build Provides: perl-Pod-Escapes -Obsoletes: perl-Pod-Escapes +Obsoletes: perl-Pod-Escapes < 2:5.24 Provides: perl-Pod-Simple -Obsoletes: perl-Pod-Simple +Obsoletes: perl-Pod-Simple < 2:5.24 Provides: perl-version -Obsoletes: perl-version +Obsoletes: perl-version < 2:5.24 Provides: perl-ExtUtils-CBuilder -Obsoletes: perl-ExtUtils-CBuilder +Obsoletes: perl-ExtUtils-CBuilder < 2:5.24 Provides: perl-IO-Compress-Base -Obsoletes: perl-IO-Compress-Base +Obsoletes: perl-IO-Compress-Base < 2:5.24 Provides: perl-Compress-Raw-Zlib -Obsoletes: perl-Compress-Raw-Zlib +Obsoletes: perl-Compress-Raw-Zlib < 2:5.24 Provides: perl-IO-Compress-Zlib -Obsoletes: perl-IO-Compress-Zlib +Obsoletes: perl-IO-Compress-Zlib < 2:5.24 Provides: perl-Compress-Zlib -Obsoletes: perl-Compress-Zlib +Obsoletes: perl-Compress-Zlib < 2:5.24 Provides: perl-IO-Compress-Bzip2 -Obsoletes: perl-IO-Compress-Bzip2 +Obsoletes: perl-IO-Compress-Bzip2 < 2:5.24 Provides: perl-Compress-Raw-Bzip2 -Obsoletes: perl-Compress-Raw-Bzip2 +Obsoletes: perl-Compress-Raw-Bzip2 < 2:5.24 Provides: perl-IO-Zlib -Obsoletes: perl-IO-Zlib +Obsoletes: perl-IO-Zlib < 2:5.24 Provides: perl-IO-Socket-IP -Obsoletes: perl-IO-Socket-IP +Obsoletes: perl-IO-Socket-IP < 2:5.24 Provides: perl-Test-Tester -Obsoletes: perl-Test-Tester +Obsoletes: perl-Test-Tester < 2:5.24 Provides: perl-Test-Builder-Tester Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} @@ -134,7 +135,6 @@ This is the devel package for perl. %prep %setup -q -#-D -T %global __requires_exclude ^perl\\( #:<< _EOF ## Warning: don't replace perl with %{name} below @@ -148,7 +148,6 @@ This is the devel package for perl. #chmod +x perl_requires.sh %build -#:<< _EOF #%if "%{_host}" != "%{_build}" ## unrepoducible ugly hacks to cross-compile perl #%{_build}-gcc -DPERL_CORE -c -fexpensive-optimizations -fomit-frame-pointer -O2 -std=c89 -O2 \ @@ -240,6 +239,8 @@ if [ "%{version}" == 5.24.4 ]; then ln -s perl%{version} %{buildroot}%{_bindir}/perl5.24.0 fi +install -D -m0644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.perl + %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} rm %{_tmppath}/{perl-mainpkg,perl-develpkg} @@ -285,6 +286,7 @@ rm %{_tmppath}/{perl-mainpkg,perl-develpkg} %{_bindir}/zipdetails #%{_bindir}/suidperl %{_libdir}/libperl.so +%{_rpmmacrodir}/macros.perl %dir %{perl_root} #% if "%{_host_cpu}" == "%{_build_cpu}" %{_mandir}/man?/* @@ -317,6 +319,15 @@ rm %{_tmppath}/{perl-mainpkg,perl-develpkg} %doc Changes README %changelog +* Mon Mar 08 2021 Silvan Calarco 5.24.4-6mamba +- update macros.perl with missing required definitions + +* Mon Mar 08 2021 Silvan Calarco 5.24.4-5mamba +- fix macros.perl with rpm 4.16 + +* Sun Mar 07 2021 Silvan Calarco 5.24.4-4mamba +- provide rpm macros.perl removed from rpm 4.16 + * Fri Feb 26 2021 Silvan Calarco 5.24.4-3mamba - remove obsolete for perl-Module-Build