From 20bc5e79a046aaa619af0df3c424926d3aa0cc92 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:29 +0000 Subject: [PATCH 01/17] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b514c6..c5e706b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := perl-YAML-LibYAML 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 0688063e492a9c466821e4fabda5d0cf21b515fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Mon, 7 Dec 2009 03:35:30 +0000 Subject: [PATCH 02/17] - rebuild against perl 5.10.1 --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 242223d..0c273a1 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.32 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Dec 7 2009 Stepan Kasal - 0.32-4 +- rebuild against perl 5.10.1 + * Sun Jul 26 2009 Fedora Release Engineering - 0.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 9a838165e27719c2ae746f127a7f5048f49a7005 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Sun, 28 Mar 2010 00:01:55 +0000 Subject: [PATCH 03/17] - perl_default_filter, PERL_INSTALL_ROOT => DESTDIR --- perl-YAML-LibYAML.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 0c273a1..3c66dc1 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.32 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -11,6 +11,8 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%{?perl_default_filter} + %description Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C library is written precisely to the YAML 1.1 @@ -30,7 +32,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +make pure_install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; @@ -52,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Sat Mar 27 2010 Chris Weyl - 0.32-5 +- perl_default_filter, PERL_INSTALL_ROOT => DESTDIR + * Mon Dec 7 2009 Stepan Kasal - 0.32-4 - rebuild against perl 5.10.1 From de020773b7cc70ea4167a551b06fd412cc9bad14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 7 May 2010 14:54:43 +0000 Subject: [PATCH 04/17] - Mass rebuild with perl-5.12.0 --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 3c66dc1..3a7f66d 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.32 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Fri May 07 2010 Marcela Maslanova - 0.32-6 +- Mass rebuild with perl-5.12.0 + * Sat Mar 27 2010 Chris Weyl - 0.32-5 - perl_default_filter, PERL_INSTALL_ROOT => DESTDIR From 5af87d178742b452e64f44925c713dca07226bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 3 Jun 2010 09:05:49 +0000 Subject: [PATCH 05/17] - update --- .cvsignore | 2 +- perl-YAML-LibYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8011612..0c191af 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -YAML-LibYAML-0.32.tar.gz +YAML-LibYAML-0.33.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 3a7f66d..0b2d0a1 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML -Version: 0.32 -Release: 6%{?dist} +Version: 0.33 +Release: 1%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Jun 3 2010 Marcela Maslanova - 0.33-1 +- update + * Fri May 07 2010 Marcela Maslanova - 0.32-6 - Mass rebuild with perl-5.12.0 diff --git a/sources b/sources index 8664202..aaf6a41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a8b9258a311e52d0938744ad2ddfc4d YAML-LibYAML-0.32.tar.gz +001a21618af05ee3a12dbb8cd6bd9b13 YAML-LibYAML-0.33.tar.gz From 2e55b1827b40ae7b44e83ea24d484c651574e985 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 08:38:35 +0000 Subject: [PATCH 06/17] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 c5e706b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-YAML-LibYAML -# $Id$ -NAME := perl-YAML-LibYAML -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),) -# attept 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) From d3310af87e2de6d9aca1d95de4c41df7ad87a31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 24 Sep 2010 13:30:25 +0200 Subject: [PATCH 07/17] - udpate --- .gitignore | 1 + perl-YAML-LibYAML.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0c191af..91d6e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ YAML-LibYAML-0.33.tar.gz +/YAML-LibYAML-0.34.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 0b2d0a1..73b42dd 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,11 +1,11 @@ Name: perl-YAML-LibYAML -Version: 0.33 +Version: 0.34 Release: 1%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ -Source0: http://www.cpan.org/authors/id/N/NU/NUFFIN/YAML-LibYAML-%{version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) @@ -26,7 +26,7 @@ iconv -f iso8859-1 -t utf-8 < README > README.1 mv README.1 README %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=perl OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} %install @@ -49,11 +49,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorarch}/auto/* -%{perl_vendorarch}/YAML* +%{perl_archlib}/auto/* +%{perl_archlib}/YAML* %{_mandir}/man3/* %changelog +* Fri Sep 23 2010 Marcela Mašláňová - 0.34-1 +- udpate + * Thu Jun 3 2010 Marcela Maslanova - 0.33-1 - update diff --git a/sources b/sources index aaf6a41..4bda7ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -001a21618af05ee3a12dbb8cd6bd9b13 YAML-LibYAML-0.33.tar.gz +85b4427e88597392d9cdefbad0469245 YAML-LibYAML-0.34.tar.gz From 9fb2c5397a4a2622ef87c97841dd1239f3eb6493 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 15:03:32 -0700 Subject: [PATCH 08/17] - Rebuilt for gcc bug 634757 --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 73b42dd..4ce28e9 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.34 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Sep 29 2010 jkeating - 0.34-2 +- Rebuilt for gcc bug 634757 + * Fri Sep 23 2010 Marcela Mašláňová - 0.34-1 - udpate From 838e9cf5ef211f48d6063cd019030bceaf5e1067 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 04:51:55 -0600 Subject: [PATCH 09/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 4ce28e9..cd853d6 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML::LibYAML Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Sep 29 2010 jkeating - 0.34-2 - Rebuilt for gcc bug 634757 From ed98ee90ee4082ce4c5ff3ec9eb3181e3bff47e9 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 16 Mar 2011 14:04:03 +0000 Subject: [PATCH 10/17] Minor fixes - Improve overly-generic package summary - README is already UTF-8 encoded in version 0.34 so don't try converting it from ISO-8859-1 --- .gitignore | 1 - perl-YAML-LibYAML.spec | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 91d6e1d..0dc61e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -YAML-LibYAML-0.33.tar.gz /YAML-LibYAML-0.34.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index cd853d6..ab126fb 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,7 +1,7 @@ Name: perl-YAML-LibYAML Version: 0.34 -Release: 3%{?dist} -Summary: YAML::LibYAML Perl module +Release: 4%{?dist} +Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ @@ -22,9 +22,6 @@ bound to Ruby. %prep %setup -q -n YAML-LibYAML-%{version} -iconv -f iso8859-1 -t utf-8 < README > README.1 -mv README.1 README - %build %{__perl} Makefile.PL INSTALLDIRS=perl OPTIMIZE="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -54,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Mar 16 2011 Paul Howarth - 0.34-4 +- Improve overly-generic package summary +- README is already UTF-8 encoded in version 0.34 so don't try converting it + * Wed Feb 09 2011 Fedora Release Engineering - 0.34-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -61,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT - Rebuilt for gcc bug 634757 * Fri Sep 23 2010 Marcela Mašláňová - 0.34-1 -- udpate +- update * Thu Jun 3 2010 Marcela Maslanova - 0.33-1 - update From 6fc83b5854d87963d570095193e5a49d1da475ee Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Mon, 4 Apr 2011 13:21:09 +0200 Subject: [PATCH 11/17] 0.35 bump, removing buildroot stuff --- .gitignore | 1 + perl-YAML-LibYAML.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0dc61e7..e185c01 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /YAML-LibYAML-0.34.tar.gz +/YAML-LibYAML-0.35.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index ab126fb..b269612 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,12 +1,11 @@ Name: perl-YAML-LibYAML -Version: 0.34 -Release: 4%{?dist} +Version: 0.35 +Release: 1%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -27,22 +26,15 @@ bound to Ruby. make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT - make pure_install DESTDIR=$RPM_BUILD_ROOT - find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - %{_fixperms} $RPM_BUILD_ROOT/* %check make test -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc Changes README @@ -51,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Apr 04 2011 Petr Sabata - 0.35-1 +- 0.35 bump +- Removing obsolete buildroot stuff + * Wed Mar 16 2011 Paul Howarth - 0.34-4 - Improve overly-generic package summary - README is already UTF-8 encoded in version 0.34 so don't try converting it diff --git a/sources b/sources index 4bda7ea..6580b71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85b4427e88597392d9cdefbad0469245 YAML-LibYAML-0.34.tar.gz +9e047b14578aefd467d13aa612e6765b YAML-LibYAML-0.35.tar.gz From 63a4f0b793ebe410b42d8beddd26cbc152313893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 17 Jun 2011 12:00:47 +0200 Subject: [PATCH 12/17] Perl mass rebuild --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index b269612..5874c53 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries @@ -43,6 +43,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Jun 17 2011 Marcela Mašláňová - 0.35-2 +- Perl mass rebuild + * Mon Apr 04 2011 Petr Sabata - 0.35-1 - 0.35 bump - Removing obsolete buildroot stuff From 3638c5f428d5ae33d0a1d35ae8166288b0eddf77 Mon Sep 17 00:00:00 2001 From: Petr Sabata Date: Fri, 30 Sep 2011 13:15:07 +0200 Subject: [PATCH 13/17] 0.37 bump --- .gitignore | 1 + perl-YAML-LibYAML.spec | 40 +++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e185c01..e3e1e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /YAML-LibYAML-0.34.tar.gz /YAML-LibYAML-0.35.tar.gz +/YAML-LibYAML-0.37.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 5874c53..26fc219 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,13 +1,31 @@ Name: perl-YAML-LibYAML -Version: 0.35 -Release: 2%{?dist} +Version: 0.37 +Release: 1%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz +BuildRequires: perl(B::Deparse) +BuildRequires: perl(base) +BuildRequires: perl(constant) +BuildRequires: perl(Cwd) +BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::Spec) +BuildRequires: perl(Test::Builder) +BuildRequires: perl(Test::Builder::Module) BuildRequires: perl(Test::More) +# Tests only +BuildRequires: perl(Devel::Peek) +BuildRequires: perl(File::Path) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Test::Base) +BuildRequires: perl(Test::Base::Filter) +BuildRequires: perl(Tie::Array) +BuildRequires: perl(Tie::Hash) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %{?perl_default_filter} @@ -22,27 +40,31 @@ bound to Ruby. %setup -q -n YAML-LibYAML-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=perl OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=perl OPTIMIZE="%{optflags}" make %{?_smp_mflags} %install -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -%{_fixperms} $RPM_BUILD_ROOT/* +make pure_install DESTDIR=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; +%{_fixperms} %{buildroot}/* %check make test %files -%defattr(-,root,root,-) %doc Changes README %{perl_archlib}/auto/* %{perl_archlib}/YAML* %{_mandir}/man3/* %changelog +* Fri Sep 30 2011 Petr Sabata - 0.37-1 +- 0.37 bump +- Remove defattr +- Correct BR + * Fri Jun 17 2011 Marcela Mašláňová - 0.35-2 - Perl mass rebuild diff --git a/sources b/sources index 6580b71..d0d476b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e047b14578aefd467d13aa612e6765b YAML-LibYAML-0.35.tar.gz +8ce120ca473c58eb0abf28fa19fdb460 YAML-LibYAML-0.37.tar.gz From d37a3cb469e93cc23ff8f47da5389d680eac9633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Fri, 13 Jan 2012 15:00:54 +0100 Subject: [PATCH 14/17] bump to 0.38 --- .gitignore | 1 + perl-YAML-LibYAML.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e3e1e3d..e783894 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /YAML-LibYAML-0.34.tar.gz /YAML-LibYAML-0.35.tar.gz /YAML-LibYAML-0.37.tar.gz +/YAML-LibYAML-0.38.tar.gz diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 26fc219..3f95210 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,5 +1,5 @@ Name: perl-YAML-LibYAML -Version: 0.37 +Version: 0.38 Release: 1%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic @@ -60,6 +60,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Jan 13 2012 Marcela Mašláňová - 0.38-2 +- bump to 0.38 + * Fri Sep 30 2011 Petr Sabata - 0.37-1 - 0.37 bump - Remove defattr diff --git a/sources b/sources index d0d476b..0c83e44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ce120ca473c58eb0abf28fa19fdb460 YAML-LibYAML-0.37.tar.gz +4aadbcf1afcce9ce087f9bffd293e43e YAML-LibYAML-0.38.tar.gz From 2d5a8241a0aed1cdb555ce36c232178235c93104 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Thu, 29 Mar 2012 18:56:28 +0100 Subject: [PATCH 15/17] Clean up and add patch for CVE-2012-1152 (CPAN RT#46507) - Fix various format string vulnerabilities (CVE-2012-1152, CPAN RT#46507) - De-duplicate buildreqs, with Module>Install>Tests priority - Install to vendor directories - Don't need to remove empty directories from buildroot - Don't use macros for commands - Make %files list more explicit - Tidy %description --- YAML-LibYAML-0.35-format-error.patch | 39 ++++++++++++++++ perl-YAML-LibYAML.spec | 67 ++++++++++++++++++---------- 2 files changed, 82 insertions(+), 24 deletions(-) create mode 100644 YAML-LibYAML-0.35-format-error.patch diff --git a/YAML-LibYAML-0.35-format-error.patch b/YAML-LibYAML-0.35-format-error.patch new file mode 100644 index 0000000..2b25380 --- /dev/null +++ b/YAML-LibYAML-0.35-format-error.patch @@ -0,0 +1,39 @@ +diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/LibYAML/perl_libyaml.c +--- YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c 2011-04-03 18:28:08.000000000 +0200 ++++ YAML-LibYAML-0.35/LibYAML/perl_libyaml.c 2011-04-08 09:25:49.633009787 +0200 +@@ -188,7 +188,7 @@ + return; + + load_error: +- croak(loader_error_msg(&loader, NULL)); ++ croak("%s", loader_error_msg(&loader, NULL)); + } + + /* +@@ -271,7 +271,7 @@ + return return_sv; + + load_error: +- croak(loader_error_msg(loader, NULL)); ++ croak("%s", loader_error_msg(loader, NULL)); + } + + /* +@@ -314,7 +314,7 @@ + else if (strlen(tag) <= strlen(prefix) || + ! strnEQ(tag, prefix, strlen(prefix)) + ) croak( +- loader_error_msg(loader, form("bad tag found for hash: '%s'", tag)) ++ "%s", loader_error_msg(loader, form("bad tag found for hash: '%s'", tag)) + ); + class = tag + strlen(prefix); + sv_bless(hash_ref, gv_stashpv(class, TRUE)); +@@ -347,7 +347,7 @@ + else if (strlen(tag) <= strlen(prefix) || + ! strnEQ(tag, prefix, strlen(prefix)) + ) croak( +- loader_error_msg(loader, form("bad tag found for array: '%s'", tag)) ++ "%s", loader_error_msg(loader, form("bad tag found for array: '%s'", tag)) + ); + class = tag + strlen(prefix); + sv_bless(array_ref, gv_stashpv(class, TRUE)); diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 3f95210..12660d7 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,67 +1,86 @@ Name: perl-YAML-LibYAML Version: 0.38 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz -BuildRequires: perl(B::Deparse) -BuildRequires: perl(base) -BuildRequires: perl(constant) +Patch0: YAML-LibYAML-0.35-format-error.patch + +# Install BuildRequires: perl(Cwd) -BuildRequires: perl(Exporter) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Find) BuildRequires: perl(File::Path) BuildRequires: perl(File::Spec) + +# Module +BuildRequires: perl >= 3:5.8.3 +BuildRequires: perl(B::Deparse) +BuildRequires: perl(base) +BuildRequires: perl(constant) +BuildRequires: perl(Exporter) +BuildRequires: perl(XSLoader) + +# Tests +BuildRequires: perl(Devel::Peek) +BuildRequires: perl(Scalar::Util) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::Builder::Module) BuildRequires: perl(Test::More) -# Tests only -BuildRequires: perl(Devel::Peek) -BuildRequires: perl(File::Path) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Test::Base) -BuildRequires: perl(Test::Base::Filter) BuildRequires: perl(Tie::Array) BuildRequires: perl(Tie::Hash) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Runtime +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) + +# Avoid provides for perl shared objects %{?perl_default_filter} %description -Kirill Siminov's "libyaml" is arguably the best YAML -implementation. The C library is written precisely to the YAML 1.1 -specification. It was originally bound to Python and was later -bound to Ruby. +Kirill Siminov's "libyaml" is arguably the best YAML implementation. The C +library is written precisely to the YAML 1.1 specification. It was originally +bound to Python and was later bound to Ruby. %prep %setup -q -n YAML-LibYAML-%{version} +# Fix format string vulnerabilities (CVE-2012-1152, CPAN RT#46507) +%patch0 -p1 + %build -%{__perl} Makefile.PL INSTALLDIRS=perl OPTIMIZE="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -%{_fixperms} %{buildroot}/* +%{_fixperms} %{buildroot} %check make test %files %doc Changes README -%{perl_archlib}/auto/* -%{perl_archlib}/YAML* -%{_mandir}/man3/* +%{perl_vendorarch}/auto/YAML/ +%{perl_vendorarch}/YAML/ +%{_mandir}/man3/YAML::XS.3pm* +%{_mandir}/man3/YAML::XS::LibYAML.3pm* %changelog -* Fri Jan 13 2012 Marcela Mašláňová - 0.38-2 -- bump to 0.38 +* Thu Mar 29 2012 Paul Howarth - 0.38-2 +- Fix various format string vulnerabilities (CVE-2012-1152, CPAN RT#46507) +- De-duplicate buildreqs, with Module>Install>Tests priority +- Install to vendor directories +- Don't need to remove empty directories from buildroot +- Don't use macros for commands +- Make %%files list more explicit +- Tidy %%description + +* Fri Jan 13 2012 Marcela Mašláňová - 0.38-1 +- Bump to 0.38 * Fri Sep 30 2011 Petr Sabata - 0.37-1 - 0.37 bump From 0b5b7f94109909aeecb3205f12e63013ee5b32ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 11 Jun 2012 10:47:59 +0200 Subject: [PATCH 16/17] Perl 5.16 rebuild --- perl-YAML-LibYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 12660d7..d129b9d 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,6 +1,6 @@ Name: perl-YAML-LibYAML Version: 0.38 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries @@ -70,6 +70,9 @@ make test %{_mandir}/man3/YAML::XS::LibYAML.3pm* %changelog +* Mon Jun 11 2012 Petr Pisar - 0.38-3 +- Perl 5.16 rebuild + * Thu Mar 29 2012 Paul Howarth - 0.38-2 - Fix various format string vulnerabilities (CVE-2012-1152, CPAN RT#46507) - De-duplicate buildreqs, with Module>Install>Tests priority From c4c7f173077bb56cb7cf04d1928f248b868ef7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 11 Jun 2012 13:04:30 +0200 Subject: [PATCH 17/17] Build-require Data::Dumper --- perl-YAML-LibYAML.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index d129b9d..28a77e1 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -24,6 +24,7 @@ BuildRequires: perl(Exporter) BuildRequires: perl(XSLoader) # Tests +BuildRequires: perl(Data::Dumper) BuildRequires: perl(Devel::Peek) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Test::Builder) @@ -72,6 +73,7 @@ make test %changelog * Mon Jun 11 2012 Petr Pisar - 0.38-3 - Perl 5.16 rebuild +- Build-require Data::Dumper * Thu Mar 29 2012 Paul Howarth - 0.38-2 - Fix various format string vulnerabilities (CVE-2012-1152, CPAN RT#46507)