From 4510e359cf2bd6a8cea41e5586663c89814298ea Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:43:59 +0000 Subject: [PATCH 1/5] Initialize branch F-13 for perl-libwww-perl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From b5092243e63a5511c3d8cecb86c5d27acadfd3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 11 Mar 2010 16:32:49 +0000 Subject: [PATCH 2/5] - update #513596 --- .cvsignore | 2 +- perl-libwww-perl.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 187609e..ae36a1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libwww-perl-5.833.tar.gz +libwww-perl-5.834.tar.gz diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index b7d507b..8649572 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -1,6 +1,6 @@ Name: perl-libwww-perl -Version: 5.833 -Release: 2%{?dist} +Version: 5.834 +Release: 1%{?dist} Summary: A Perl interface to the World-Wide Web Group: Development/Libraries @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 11 2010 Marcela Mašláňová 5.834-1 +- update #513596 + * Mon Dec 7 2009 Stepan Kasal - 5.833-2 - rebuild against perl 5.10.1 diff --git a/sources b/sources index b7d17a7..85d71b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fd7d7e793355c4e6e6806c70f6d2917 libwww-perl-5.833.tar.gz +f2ed8a461f76556c9caed9087f47c86c libwww-perl-5.834.tar.gz From e33a393f91729aa21e883841161afcc15b50727e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 08:41:17 +0000 Subject: [PATCH 3/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fa36f39..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-libwww-perl -# $Id: Makefile,v 1.2 2007/10/15 19:17:04 notting Exp $ -NAME := perl-libwww-perl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 8d82710e5204d65026d0c12164f2769ecab52f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 27 Sep 2010 13:40:37 +0200 Subject: [PATCH 4/5] - update --- .gitignore | 1 + perl-libwww-perl.spec | 78 +++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 32 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index ae36a1b..66e14d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libwww-perl-5.834.tar.gz +/libwww-perl-5.837.tar.gz diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index 8649572..bc29598 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -1,5 +1,5 @@ Name: perl-libwww-perl -Version: 5.834 +Version: 5.837 Release: 1%{?dist} Summary: A Perl interface to the World-Wide Web @@ -8,57 +8,30 @@ License: GPL+ or Artistic URL: http://search.cpan.org/dist/libwww-perl/ Source0: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildArch: noarch BuildRequires: perl(HTML::Entities), perl(URI), perl(Test::More), perl(ExtUtils::MakeMaker) BuildRequires: mailcap BuildRequires: perl(Compress::Zlib) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Compress::Zlib) +Requires: perl(Compress::Zlib), perl(MIME::Base64), perl(Net::FTP) Requires: perl-HTML-Parser >= 3.33 Requires: mailcap %description -The libwww-perl collection is a set of Perl modules which provides a -simple and consistent application programming interface to the -World-Wide Web. The main focus of the library is to provide classes -and functions 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. +The libwww-perl collection is a set of Perl modules which provides a simple and +consistent application programming interface to the World-Wide Web. The main +focus of the library is to provide classes and functions 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. +%{?perl_default_filter} %prep %setup -q -n libwww-perl-%{version} - -# Filter unwanted Provides: -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/perl(HTTP::Headers)$/d' -EOF - -%define __perl_provides %{_builddir}/libwww-perl-%{version}/%{name}-prov -chmod +x %{__perl_provides} - - -# Filter unwanted Requires: -cat << \EOF > %{name}-req -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/perl(HTTP::GHTTP)/d' |\ - sed -e '/perl(Win32)/d' |\ - sed -e '/perl(Authen::NTLM)/d' -EOF - -%define __perl_requires %{_builddir}/libwww-perl-%{version}/%{name}-req -chmod +x %{__perl_requires} - - %build # Install the aliases by default -%{__perl} Makefile.PL INSTALLDIRS=vendor --aliases < /dev/null +%{__perl} Makefile.PL INSTALLDIRS=perl --aliases < /dev/null make %{?_smp_mflags} %install @@ -76,7 +49,7 @@ done # Use system wide MIME types (link also to blib/... for "make test"). Doing # this stuff before "make install" would not cause the symlink to be packaged # but a copy of /etc/mime.types. -for file in {blib/lib,$RPM_BUILD_ROOT%{perl_vendorlib}}/LWP/media.types ; do +for file in {blib/lib,$RPM_BUILD_ROOT%{perl_privlib}}/LWP/media.types ; do [ ! -f $file ] && echo ERROR && exit 1 ln -sf /etc/mime.types $file done @@ -93,22 +66,31 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS Changes README* %{_bindir}/* -%{perl_vendorlib}/lwp*.pod -%{perl_vendorlib}/LWP.pm -%{perl_vendorlib}/Bundle/ -%{perl_vendorlib}/File/ -%{perl_vendorlib}/HTML/ -%{perl_vendorlib}/HTTP/ -%{perl_vendorlib}/LWP/ -%{perl_vendorlib}/Net/ -%{perl_vendorlib}/WWW/ +%{perl_privlib}/lwp*.pod +%{perl_privlib}/LWP.pm +%{perl_privlib}/Bundle/ +%{perl_privlib}/File/ +%{perl_privlib}/HTML/ +%{perl_privlib}/HTTP/ +%{perl_privlib}/LWP/ +%{perl_privlib}/Net/ +%{perl_privlib}/WWW/ %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog -* Thu Mar 11 2010 Marcela Mašláňová 5.834-1 -- update #513596 +* Mon Sep 27 2010 Marcela Mašláňová 5.837-1 +- update + +* Mon Jul 12 2010 Marcela Maslanova - 5.836-1 +- update + +* Mon Jun 21 2010 Jesse Keating - 5.834-1 +- Bump to match what was pushed to F13. + +* Sun May 02 2010 Marcela Maslanova - 5.833-3 +- Mass rebuild with perl-5.12.0 * Mon Dec 7 2009 Stepan Kasal - 5.833-2 - rebuild against perl 5.10.1 diff --git a/sources b/sources index 85d71b0..bf00914 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2ed8a461f76556c9caed9087f47c86c libwww-perl-5.834.tar.gz +9bbf1bce482b0bac98bb4f04253c03d0 libwww-perl-5.837.tar.gz From 8242a8fe85b5732b03ce98a6416363c9b5e73877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 27 Sep 2010 14:18:23 +0200 Subject: [PATCH 5/5] Filter provides/requires --- perl-libwww-perl.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec index bc29598..5f1b82c 100644 --- a/perl-libwww-perl.spec +++ b/perl-libwww-perl.spec @@ -28,6 +28,13 @@ use and even classes that help you implement simple HTTP servers. %prep %setup -q -n libwww-perl-%{version} +%{?filter_setup: +%filter_from_provides /perl(HTTP::Headers)/d +%filter_from_requires /perl(HTTP:GHTTP)/d +%filter_from_requires /perl(Win32)/d +%filter_from_requires /perl(Authen::NTLM)/d +%?perl_default_filter +} %build # Install the aliases by default