[ConsoleKit] Install docs to %{_pkgdocdir} where available (#993708).

Ville Skyttä scop at fedoraproject.org
Mon Aug 12 09:16:12 UTC 2013


commit 5c72b07f6dc9c3d00bbab3e70c81992e4c551b75
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Aug 12 12:15:17 2013 +0300

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

 ConsoleKit.spec |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index c564c5f..d0808ee 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -3,10 +3,12 @@
 %define dbus_glib_version       0.70
 %define polkit_version          0.92
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Summary: System daemon for tracking users, sessions and seats
 Name: ConsoleKit
 Version: 0.4.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
@@ -89,7 +91,7 @@ This package contains developer documentation for ConsoleKit.
 %patch1 -p1
 
 %build
-%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
+%configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_pkgdocdir}
 
 make
 
@@ -109,7 +111,7 @@ rm -f $RPM_BUILD_ROOT/%{_var}/log/ConsoleKit/history
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init
 cp data/ck-log-system-{start,stop,restart}.conf $RPM_BUILD_ROOT%{_sysconfdir}/init
 
-cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_pkgdocdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,11 +134,11 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %dir %{_datadir}/doc/%{name}-%{version}
-%doc %{_datadir}/doc/%{name}-%{version}/README
-%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
-%doc %{_datadir}/doc/%{name}-%{version}/NEWS
-%doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/AUTHORS
+%doc %{_pkgdocdir}/NEWS
+%doc %{_pkgdocdir}/COPYING
 %{_sysconfdir}/dbus-1/system.d/*
 %dir %{_sysconfdir}/init
 %config(noreplace) %{_sysconfdir}/init/*
@@ -191,10 +193,13 @@ fi
 
 %files docs
 %defattr(-,root,root,-)
-%doc %dir %{_datadir}/doc/%{name}-%{version}/spec
-%doc %{_datadir}/doc/%{name}-%{version}/spec/*
+%doc %dir %{_pkgdocdir}/spec
+%doc %{_pkgdocdir}/spec/*
 
 %changelog
+* Mon Aug 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.4.5-7
+- Install docs to %%{_pkgdocdir} where available (#993708).
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list