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

Ville Skyttä scop at fedoraproject.org
Fri Jul 26 07:58:40 UTC 2013


commit f32020cce93e3680184cc5ef78210048108b7c79
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jul 26 10:57:51 2013 +0300

    Install docs to %{_pkgdocdir} where available.

 portecle.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/portecle.spec b/portecle.spec
index 99f509d..2b693df 100644
--- a/portecle.spec
+++ b/portecle.spec
@@ -1,8 +1,8 @@
-%global docdir  %{_docdir}/%{name}-%{version}/doc
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           portecle
 Version:        1.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Multipurpose keystore and certificate tool
 
 License:        GPLv2+
@@ -39,7 +39,7 @@ cp -p src/main/net/sf/portecle/images/splash.png doc/images/
 
 
 %build
-%ant -Djar.classpath= -Dhelpbaseurl=file://%{docdir}/ \
+%ant -Djar.classpath= -Dhelpbaseurl=file://%{_pkgdocdir}/doc/ \
     -Dbcprov.jar=$(build-classpath bcprov) jar
 
 
@@ -60,7 +60,7 @@ desktop-file-install \
 # Enable experimental features in non-EL builds by default
 install -dm 755 $RPM_BUILD_ROOT%{_bindir}
 exp="%{?rhel:false}%{!?rhel:true}"
-sed -e "s|@DOCDIR@|%{docdir}|" -e "s|@EXPERIMENTAL@|$exp|" %{SOURCE1} \
+sed -e "s|@DOCDIR@|%{_pkgdocdir}/doc|" -e "s|@EXPERIMENTAL@|$exp|" %{SOURCE1} \
     > $RPM_BUILD_ROOT%{_bindir}/portecle
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/portecle
 
@@ -89,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.7-9
+- Install docs to %%{_pkgdocdir} where available.
+
 * Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7-8
 - Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
 


More information about the scm-commits mailing list