[libpng10] Move to unversioned documentation directories

Paul Howarth pghmcfc at fedoraproject.org
Sat Jul 27 18:19:31 UTC 2013


commit f7cdf2c5abcd353f58e634f65038b0205b9828f6
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Jul 27 19:00:05 2013 +0100

    Move to unversioned documentation directories

 libpng10.spec |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/libpng10.spec b/libpng10.spec
index f4a6140..2e54063 100644
--- a/libpng10.spec
+++ b/libpng10.spec
@@ -1,7 +1,7 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
 Version:	1.0.60
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
@@ -12,6 +12,10 @@ Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
 
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global libpng10_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+
 %description
 The libpng10 package contains an old version of libpng, a library of functions
 for creating and manipulating PNG (Portable Network Graphics) image format
@@ -60,13 +64,13 @@ make DESTDIR=%{buildroot} install
 # first, which means the splitting of docs into two packages won't work.
 # The alternative would be to have the devel docs in a different directory,
 # but I don't want to do that.
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{libpng10_docdir}
 # Docs for main package
 install -p -m 644 ANNOUNCE README TODO CHANGES LICENSE Y2KINFO \
-	%{buildroot}%{_docdir}/%{name}-%{version}/
+	%{buildroot}%{libpng10_docdir}/
 # Docs for devel package
 install -p -m 644 example.c libpng-%{version}.txt \
-	%{buildroot}%{_docdir}/%{name}-%{version}/
+	%{buildroot}%{libpng10_docdir}/
 
 # Unpackaged files
 rm -f \
@@ -96,25 +100,28 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}/
-%doc %{_docdir}/%{name}-%{version}/ANNOUNCE
-%doc %{_docdir}/%{name}-%{version}/CHANGES
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/TODO
-%doc %{_docdir}/%{name}-%{version}/Y2KINFO
+%dir %{libpng10_docdir}/
+%doc %{libpng10_docdir}/ANNOUNCE
+%doc %{libpng10_docdir}/CHANGES
+%doc %{libpng10_docdir}/LICENSE
+%doc %{libpng10_docdir}/README
+%doc %{libpng10_docdir}/TODO
+%doc %{libpng10_docdir}/Y2KINFO
 %{_libdir}/libpng.so.2
 %{_libdir}/libpng.so.2.%{version}
 
 %files devel
 %defattr(-,root,root,-)
-%doc %{_docdir}/%{name}-%{version}/example.c
-%doc %{_docdir}/%{name}-%{version}/libpng-%{version}.txt
+%doc %{libpng10_docdir}/example.c
+%doc %{libpng10_docdir}/libpng-%{version}.txt
 %{_includedir}/libpng10/
 %{_libdir}/libpng10.so
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Sat Jul 27 2013 Paul Howarth <paul at city-fan.org> 1.0.60-5
+- install docs to %%{_pkgdocdir} where available
+
 * Sun Mar 24 2013 Paul Howarth <paul at city-fan.org> 1.0.60-4
 - tweak config.guess and config.sub to add aarch64 support (#925862)
 - update source URL, moved upstream


More information about the scm-commits mailing list