[perl-XML-SAX-Base] Handle use of unversioned doc-dirs from F-20

Paul Howarth pghmcfc at fedoraproject.org
Sun Aug 4 21:29:37 UTC 2013


commit 004f4f5c3fd8c51cae88d3e353d026c880c2712e
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Aug 4 22:24:02 2013 +0100

    Handle use of unversioned doc-dirs from F-20

 perl-XML-SAX-Base.spec |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/perl-XML-SAX-Base.spec b/perl-XML-SAX-Base.spec
index 59e4b61..2e89e4b 100644
--- a/perl-XML-SAX-Base.spec
+++ b/perl-XML-SAX-Base.spec
@@ -1,6 +1,6 @@
 Name:           perl-XML-SAX-Base
 Version:        1.08
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Base class SAX drivers and filters
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -15,9 +15,13 @@ BuildRequires:  perl(Test::More) >= 0.88
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Conflicts:      perl-XML-SAX < 0.99-1
 
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global our_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
 %description
 This module has a very simple task - to be a base class for Perl SAX drivers
-and filters. It's default behaviour is to pass the input directly to the
+and filters. Its default behavior is to pass the input directly to the
 output unchanged. It can be useful to use this module as a base class so
 you don't have to, for example, implement the characters() callback.
 
@@ -30,13 +34,11 @@ make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} $RPM_BUILD_ROOT
 
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT/%{perl_vendorlib}/XML/SAX/BuildSAXBase.pl $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{our_docdir}
+mv $RPM_BUILD_ROOT%{perl_vendorlib}/XML/SAX/BuildSAXBase.pl $RPM_BUILD_ROOT%{our_docdir}
 
 %check
 make test
@@ -47,6 +49,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Sun Aug  4 2013 Paul Howarth <paul at city-fan.org> - 1.08-10
+- Handle use of unversioned doc-dirs from F-20
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -56,7 +61,7 @@ make test
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Tue Nov 22 2012 Jitka Plesnikova <jplesnik at redhat.com> - 1.08-6
+* Thu Nov 22 2012 Jitka Plesnikova <jplesnik at redhat.com> - 1.08-6
 - Update dependencies
 - Replace PERL_INSTALL_ROOT with DESTDIR
 - Update description and summary



More information about the perl-devel mailing list