[libnjb] Install docs to %{_pkgdocdir} where available.

Linus Walleij snirkel at fedoraproject.org
Mon Nov 4 02:50:07 UTC 2013


commit 09174692a4087065d54a79c286a269facd85b705
Author: Linus Walleij <triad at df.lth.se>
Date:   Mon Nov 4 03:49:51 2013 +0100

    Install docs to %{_pkgdocdir} where available.

 libnjb.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libnjb.spec b/libnjb.spec
index d5521eb..c738df0 100644
--- a/libnjb.spec
+++ b/libnjb.spec
@@ -1,9 +1,11 @@
 # SPEC file for libnjb, primary target is the Fedora Extras
 # RPM repository.
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		libnjb
 Version:	2.2.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -63,10 +65,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p -m 644 libnjb.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
-INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_pkgdocdir}
 # Touch generated files to make them always have the same time stamp.
 touch -r configure.ac \
-      $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/* \
+      $RPM_BUILD_ROOT%{_pkgdocdir}/html/* \
       $RPM_BUILD_ROOT%{_includedir}/*.h \
       $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
 # Remove the Doxygen HTML documentation, this get different
@@ -93,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-, root, root)
 %{_libdir}/*.so
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/*
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/*
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 


More information about the scm-commits mailing list