From 9406a97d0a50a9bd06b4d5c010573eddc7944e017cd1a670d47d752af9135090 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 26 Nov 2010 16:14:21 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/perl revision 52.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=ba794eef7c98898a70e91f8f808204cd --- perl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl.spec b/perl.spec index 5fbf2c1..4b7fe77 100644 --- a/perl.spec +++ b/perl.spec @@ -21,7 +21,7 @@ Name: perl Summary: The Perl interpreter Version: 5.12.2 -Release: 2 +Release: 3 %define pversion 5.12.2 License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl From 947700b01febb681f9a329db3b5de02b021291ee099c328fa9e9a552a4199f0e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 29 Nov 2010 15:20:45 +0000 Subject: [PATCH 2/4] - simplify macro logic a bit OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=49 --- macros.perl | 12 +++++------- perl.changes | 5 +++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/macros.perl b/macros.perl index b79d73b..a1fa930 100644 --- a/macros.perl +++ b/macros.perl @@ -26,13 +26,11 @@ # %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist(n:) \ - if [ %{_target_cpu} == noarch ]; then \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir ; \ - else \ - test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto && \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm ; \ + if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | xargs -0 -r rm \ + if [ %{_target_cpu} == noarch ]; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | xargs -0 -r rmdir \ + fi \ fi \ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod \ %nil diff --git a/perl.changes b/perl.changes index cdd5081..4894d60 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 29 15:20:19 UTC 2010 - coolo@novell.com + +- simplify macro logic a bit + ------------------------------------------------------------------- Mon Nov 22 19:27:42 UTC 2010 - chris@computersalat.de From 517eaefdaffcf7657163b2e3e175f0d52de9b9ba1b6d82bb632102404443101f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 30 Nov 2010 10:23:22 +0000 Subject: [PATCH 3/4] - added a new macro %perl_requires OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=50 --- macros.perl | 15 +++++++++++++++ perl.changes | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/macros.perl b/macros.perl index a1fa930..3ea4f7c 100644 --- a/macros.perl +++ b/macros.perl @@ -22,6 +22,21 @@ %perl_installarchlib %(perl -V:installarchlib | sed "s!.*='!!;s!'.*!!") %perl_prefix %{buildroot} +# Macro to encapsulate perl requires (empty for fedora and suse > 11.3) +# we keep the complicated form even here to easy sync the other macros with +# perl-macros package +# +%if 0%{?suse_version} +# dummy version for the version mls added automatic version requires +%if %suse_version < 1701 +%perl_requires Requires: perl = %{perl_version} +%else +%perl_requires nil +%endif +%else +%perl_requires nil +%endif + # suse specific macros # %perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor diff --git a/perl.changes b/perl.changes index 4894d60..9dd602f 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 30 10:23:06 UTC 2010 - coolo@novell.com + +- added a new macro %perl_requires + ------------------------------------------------------------------- Mon Nov 29 15:20:19 UTC 2010 - coolo@novell.com From f0e5eff64a61843f457f6fc5bd64b99debead54df947aa48c7423c5f9d14eb59 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 30 Nov 2010 10:54:42 +0000 Subject: [PATCH 4/4] fix macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=51 --- macros.perl | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/macros.perl b/macros.perl index 3ea4f7c..4ec7a2c 100644 --- a/macros.perl +++ b/macros.perl @@ -26,15 +26,9 @@ # we keep the complicated form even here to easy sync the other macros with # perl-macros package # -%if 0%{?suse_version} -# dummy version for the version mls added automatic version requires -%if %suse_version < 1701 -%perl_requires Requires: perl = %{perl_version} -%else -%perl_requires nil -%endif -%else -%perl_requires nil +%perl_requires() \ +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1700 \ +Requires: perl = %{perl_version} \ %endif # suse specific macros