From a0a483ae30ce829d119588f0cf7b924de20a3007819e0536d60dea23e1fabff9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 1 Dec 2010 06:56:56 +0000 Subject: [PATCH 1/3] siwtch to perl_requires macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-libwww-perl?expand=0&rev=22 --- perl-libwww-perl.changes | 5 +++++ perl-libwww-perl.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/perl-libwww-perl.changes b/perl-libwww-perl.changes index a560f57..3bdc8bc 100644 --- a/perl-libwww-perl.changes +++ b/perl-libwww-perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 1 06:55:39 UTC 2010 - coolo@novell.com + +- switch to perl_requires macro + ------------------------------------------------------------------- Tue Sep 21 10:04:00 CEST 2010 - anicka@suse.cz diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index 38a5795..d5d3fb3 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -45,7 +45,7 @@ BuildRequires: perl(IO::Uncompress::Gunzip) BuildRequires: perl(IO::Uncompress::Inflate) BuildRequires: perl(IO::Uncompress::RawInflate) BuildRequires: perl(URI) >= 1.10 -Requires: perl = %{perl_version} +%{perl_requires} Requires: perl(Compress::Raw::Zlib) Requires: perl(Crypt::SSLeay) Requires: perl(Digest::MD5) From 84c93d367b7be27cd9ceceb15c821dc816aab7f065eecdab5f274fab1f30f267 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 2 Dec 2010 06:31:58 +0000 Subject: [PATCH 2/3] - disable HTTP:GHTTP and ran spec-cleaner OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-libwww-perl?expand=0&rev=23 --- disable-ghttp.diff | 13 +++++++++++++ perl-libwww-perl.changes | 5 +++++ perl-libwww-perl.spec | 36 +++++++++++++++--------------------- 3 files changed, 33 insertions(+), 21 deletions(-) create mode 100644 disable-ghttp.diff diff --git a/disable-ghttp.diff b/disable-ghttp.diff new file mode 100644 index 0000000..28bb48c --- /dev/null +++ b/disable-ghttp.diff @@ -0,0 +1,13 @@ +Index: libwww-perl-5.837/lib/LWP/Protocol/GHTTP.pm +=================================================================== +--- libwww-perl-5.837.orig/lib/LWP/Protocol/GHTTP.pm 2008-04-11 20:59:19.000000000 +0200 ++++ libwww-perl-5.837/lib/LWP/Protocol/GHTTP.pm 2010-12-02 07:29:54.556842082 +0100 +@@ -16,7 +16,7 @@ require LWP::Protocol; + require HTTP::Response; + require HTTP::Status; + +-use HTTP::GHTTP qw(METHOD_GET METHOD_HEAD METHOD_POST); ++# dropped long ago use HTTP::GHTTP qw(METHOD_GET METHOD_HEAD METHOD_POST); + + my %METHOD = + ( diff --git a/perl-libwww-perl.changes b/perl-libwww-perl.changes index 3bdc8bc..0e00a01 100644 --- a/perl-libwww-perl.changes +++ b/perl-libwww-perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 2 06:31:24 UTC 2010 - coolo@novell.com + +- disable HTTP:GHTTP and ran spec-cleaner + ------------------------------------------------------------------- Wed Dec 1 06:55:39 UTC 2010 - coolo@novell.com diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index d5d3fb3..a464463 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -15,48 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: perl-libwww-perl -%define cpan_name libwww-perl -Summary: The World-Wide Web library for Perl Version: 5.837 Release: 1 License: GPL+, Artistic License -Group: Development/Libraries/Perl +%define cpan_name libwww-perl +Summary: The World-Wide Web library for Perl Url: http://search.cpan.org/dist/libwww-perl/ +Group: Development/Libraries/Perl #Source: http://www.cpan.org/modules/by-module/libwww/libwww-perl-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.bz2 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-OPENSUSE -- disable one perl requires that would be created automatically and we're unable to provide +Patch0: disable-ghttp.diff BuildRequires: perl -%if 0%{?suse_version} < 1120 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch BuildRequires: perl-macros -%endif -BuildRequires: perl(Crypt::SSLeay) BuildRequires: perl(Compress::Raw::Zlib) +BuildRequires: perl(Crypt::SSLeay) BuildRequires: perl(Digest::MD5) BuildRequires: perl(HTML::Parser) >= 3.33 BuildRequires: perl(HTML::Tagset) -BuildRequires: perl(IO::Compress::Gzip) BuildRequires: perl(IO::Compress::Deflate) +BuildRequires: perl(IO::Compress::Gzip) BuildRequires: perl(IO::Uncompress::Gunzip) BuildRequires: perl(IO::Uncompress::Inflate) BuildRequires: perl(IO::Uncompress::RawInflate) BuildRequires: perl(URI) >= 1.10 -%{perl_requires} Requires: perl(Compress::Raw::Zlib) Requires: perl(Crypt::SSLeay) Requires: perl(Digest::MD5) Requires: perl(HTML::Parser) >= 3.33 Requires: perl(HTML::Tagset) -Requires: perl(IO::Compress::Gzip) Requires: perl(IO::Compress::Deflate) +Requires: perl(IO::Compress::Gzip) Requires: perl(IO::Uncompress::Gunzip) Requires: perl(IO::Uncompress::Inflate) Requires: perl(IO::Uncompress::RawInflate) Requires: perl(URI) >= 1.10 +%{perl_requires} %description The libwww-perl collection is a set of Perl modules which provides a @@ -66,14 +65,9 @@ that allow you to write WWW clients. The library also contain modules that are of more general use and even classes that help you implement simple HTTP servers. - -Authors: --------- - Gisle Aas - Martijn Koster - %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -89,13 +83,13 @@ mv t/live/jigsaw-md5-get.t t/live/jigsaw-md5-get.tt %install %perl_make_install # remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch +%{__rm} -rf %{buildroot}%perl_vendorarch # remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%{__rm} -rf %{buildroot}%perl_archlib %perl_gen_filelist %clean -%{__rm} -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files -f %{name}.files %defattr(-,root,root,-) From e1a22eea3f9fc6068570495e3bb550c2fe91d5b02841e95c0eff5f2b9593e910 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 3 Dec 2010 15:21:09 +0000 Subject: [PATCH 3/3] always buildrequire perl-macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-libwww-perl?expand=0&rev=24 --- perl-libwww-perl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index a464463..d62325c 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -31,6 +31,7 @@ Source: %{cpan_name}-%{version}.tar.bz2 Patch0: disable-ghttp.diff BuildRequires: perl BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{perl_requires} BuildArch: noarch BuildRequires: perl-macros BuildRequires: perl(Compress::Raw::Zlib) @@ -55,7 +56,6 @@ Requires: perl(IO::Uncompress::Gunzip) Requires: perl(IO::Uncompress::Inflate) Requires: perl(IO::Uncompress::RawInflate) Requires: perl(URI) >= 1.10 -%{perl_requires} %description The libwww-perl collection is a set of Perl modules which provides a