[perl-YAML] Tidy up and fix build dependency loop

Paul Howarth pghmcfc at fedoraproject.org
Tue Jul 17 11:55:52 UTC 2012


commit b92f5aef9e337e5e8a5bbb04b9b47cc282ee7669
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Jul 17 12:54:40 2012 +0100

    Tidy up and fix build dependency loop
    
    - Haven't needed to fix documentation character encoding since 0.79
    - Drop Test::Base build dependency again to avoid a BR loop (#215637)
    - Filter private provides perl(yaml_mapping), perl(yaml_scalar) and
      perl(yaml_sequence)
    - Don't need to remove empty directories from the buildroot
    - This release by MSTROUT -> update source URL

 perl-YAML.spec |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/perl-YAML.spec b/perl-YAML.spec
index a7c0dd5..ab60b62 100644
--- a/perl-YAML.spec
+++ b/perl-YAML.spec
@@ -1,11 +1,11 @@
 Name:           perl-YAML
 Version:        0.84
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/YAML/
-Source0:        http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/YAML-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(constant)
@@ -13,12 +13,14 @@ BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(lib)
-BuildRequires:  perl(Test::Base)
-BuildRequires:  perl(Test::Base::Filter)
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
 Requires:       perl(Data::Dumper)
 
+# Filter private provides:
+# perl(yaml_mapping) perl(yaml_scalar) perl(yaml_sequence)
+%global __provides_exclude ^perl\\(yaml_
+
 %description
 The YAML.pm module implements a YAML Loader and Dumper based on the
 YAML 1.0 specification. http://www.yaml.org/spec/
@@ -31,24 +33,20 @@ specification.
 %prep
 %setup -q -n YAML-%{version}
 
-# Re-code docs as UTF-8
-iconv -f iso-8859-1 -t utf8 < README > README.utf8
-mv README.utf8 README
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}
+
 # Removing Test::YAML (at least temporarily) due
 # to security concerns and questionable value.
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197539
 rm -f %{buildroot}%{perl_vendorlib}/Test/YAML* \
     %{buildroot}%{_mandir}/man3/Test::YAML*.3*
-find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-%{_fixperms} %{buildroot}/*
 
 %check
 make test
@@ -59,6 +57,14 @@ make test
 %{_mandir}/man3/YAML*.3*
 
 %changelog
+* Tue Jul 17 2012 Paul Howarth <paul at city-fan.org> - 0.84-2
+- Haven't needed to fix documentation character encoding since 0.79
+- Drop Test::Base build dependency again to avoid a BR loop (#215637)
+- Filter private provides perl(yaml_mapping), perl(yaml_scalar) and
+  perl(yaml_sequence)
+- Don't need to remove empty directories from the buildroot
+- This release by MSTROUT -> update source URL
+
 * Mon Jul 16 2012 Petr Ĺ abata <contyk at redhat.com> - 0.84-1
 - 0.84 bump
 - Drop command macros


More information about the scm-commits mailing list