[libvorbis] Install docs to %{_pkgdocdir} where available (#993967).

Ville Skyttä scop at fedoraproject.org
Thu Aug 8 20:51:48 UTC 2013


commit 2e671577a94428e82ba47a650128fbf67c0ec401
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Aug 8 23:51:37 2013 +0300

    Install docs to %{_pkgdocdir} where available (#993967).

 libvorbis.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/libvorbis.spec b/libvorbis.spec
index e221361..cbb84d2 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Summary:	The Vorbis General Audio Compression Codec
 Name:		libvorbis
 Version:	1.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -51,9 +53,8 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -pm 644 -t $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
-    AUTHORS COPYING README
+make DESTDIR=$RPM_BUILD_ROOT install docdir=%{_pkgdocdir}
+install -pm 644 -t $RPM_BUILD_ROOT%{_pkgdocdir} AUTHORS COPYING README
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -62,8 +63,8 @@ make check
 
 %files
 %defattr(-,root,root)
-%doc %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/COPYING
+%doc %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/COPYING
 %{_libdir}/libvorbis.so.*
 %{_libdir}/libvorbisfile.so.*
 %{_libdir}/libvorbisenc.so.*
@@ -79,9 +80,9 @@ make check
 
 %files devel-docs
 %defattr(-,root,root)
-%{_docdir}/%{name}-%{version}/*
-%exclude %{_docdir}/%{name}-%{version}/COPYING
-%exclude %{_docdir}/%{name}-%{version}/doxygen-build.stamp
+%{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/COPYING
+%exclude %{_pkgdocdir}/doxygen-build.stamp
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Aug  8 2013 Ville Skyttä <ville.skytta at iki.fi> - 1:1.3.3-6
+- Install docs to %%{_pkgdocdir} where available (#993967).
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.3.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list