[gsmartcontrol] Install docs to %{_pkgdocdir} where available (#993808).
Ville Skyttä
scop at fedoraproject.org
Wed Nov 13 18:16:35 UTC 2013
commit 4ac5ec90c47b455ed179a8c7b13e1a9e10980aec
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Nov 13 20:15:53 2013 +0200
Install docs to %{_pkgdocdir} where available (#993808).
gsmartcontrol.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gsmartcontrol.spec b/gsmartcontrol.spec
index 08522ea..c1f8ea0 100644
--- a/gsmartcontrol.spec
+++ b/gsmartcontrol.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: gsmartcontrol
Version: 0.8.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical user interface for smartctl
Group: Applications/System
@@ -32,17 +34,12 @@ data to determine its health, as well as run various tests on it.
%patch -P 0 -p1 -b .console-helper
%build
-%configure
+%configure --docdir=%{_pkgdocdir}
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
-
-# make install puts the docs into an unversioned doc directory,
-# move them to a versioned doc directory to prevent having both
-# a versioned and an unversioned doc directory
-mv %{buildroot}%{_defaultdocdir}/%{name}{,-%{version}}
-install -m 644 COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+install -pm 644 COPYING %{buildroot}%{_pkgdocdir}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -94,11 +91,14 @@ fi
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%{_mandir}/man1/%{name}.1.*
%{_mandir}/man1/%{name}-root.1.*
-%{_docdir}/%{name}-%{version}
+%{_pkgdocdir}
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
%changelog
+* Wed Nov 13 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-4
+- Install docs to %%{_pkgdocdir} where available (#993808).
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list