[yacpi] Install docs to %{_pkgdocdir} where available (#993880).

Ville Skyttä scop at fedoraproject.org
Sun Nov 3 11:46:22 UTC 2013


commit f63eb92ef217a1c27ce4f6bda02f37b5c0d045b3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 3 13:46:33 2013 +0200

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

 yacpi.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/yacpi.spec b/yacpi.spec
index d9f032d..0578d9d 100644
--- a/yacpi.spec
+++ b/yacpi.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           yacpi
 Version:        3.0.1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Yet Another Configuration and Power Interface 
 
 Group:          Applications/System
@@ -24,7 +26,9 @@ can display them.
 %setup -q
 %patch0 -p1
 sed -i "s/CFLAGS  = -O2 -Wall -g/CFLAGS = $RPM_OPT_FLAGS/" Makefile
-sed -i "s&share/doc/%{name}&share/doc/%{name}-%{version}&" Makefile
+#fix convert changelog to UTF8
+iconv -f ISO_8859-1 -t UTF-8 -o CHANGELOG{.utf8,}
+mv CHANGELOG{.utf8,}
 
 
 %build
@@ -33,11 +37,8 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT DOCPATH=%{_pkgdocdir}
 
-#fix convert changelog to UTF8
-iconv -f ISO_8859-1 -t UTF-8 -o $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}
-mv $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}/CHANGELOG{.utf8,}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,16 +47,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%dir %{_defaultdocdir}/%{name}-%{version}
-%doc %{_defaultdocdir}/%{name}-%{version}/CHANGELOG
-%doc %{_defaultdocdir}/%{name}-%{version}/COPYING
-%doc %{_defaultdocdir}/%{name}-%{version}/README
-%doc %{_defaultdocdir}/%{name}-%{version}/THANKS
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/CHANGELOG
+%doc %{_pkgdocdir}/COPYING
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/THANKS
 %{_mandir}/man1/%{name}.1.gz
 
 
 
 %changelog
+* Sun Nov  3 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.0.1-19
+- Install docs to %%{_pkgdocdir} where available (#993880).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list