[nx] Install docs to %{_pkgdocdir} where available.
Ville Skyttä
scop at fedoraproject.org
Fri Jul 26 18:04:07 UTC 2013
commit b12e66a13baa828edf83045de8c2be541acf09fe
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Jul 26 21:03:55 2013 +0300
Install docs to %{_pkgdocdir} where available.
nx.spec | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/nx.spec b/nx.spec
index e04eaef..a646226 100644
--- a/nx.spec
+++ b/nx.spec
@@ -2,11 +2,12 @@
%define _pkglibdir %{_libdir}/nx
%define _pkgdatadir %{_datadir}/nx
%define _pkglibexecdir %{_libexecdir}/nx
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Summary: Proxy system for X11
Name: nx
Version: 3.5.0
-Release: 17%{?dist}
+Release: 18%{?dist}
# MIT on the X11 bits
License: GPLv2 and MIT
Group: Applications/Internet
@@ -129,32 +130,35 @@ ln -s %{_pkglibexecdir}/nxproxy %{buildroot}%{_bindir}/nxproxy
# set up shared lib symlinks
/sbin/ldconfig -n %{buildroot}%{_pkglibdir}
# install scripts
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cp -a nxscripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+mkdir -p %{buildroot}%{_pkgdocdir}
+cp -a nxscripts %{buildroot}%{_pkgdocdir}
# documentation and license
# TODO: docs tarball contains dupes wrt nxscripts
-tar xjf %{SOURCE10} -C %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+tar xjf %{SOURCE10} -C %{buildroot}%{_pkgdocdir}
for i in nxcomp nxcompext nxcompshad nxproxy nxssh nx-X11 \
nx-X11/programs/nxauth nx-X11/programs/Xserver/hw/nxagent; do
for j in CHANGELOG COPYING LICENSE; do
[ -f $i/$j ] && install -Dpm 0644 $i/$j \
- %{buildroot}%{_defaultdocdir}/%{name}-%{version}/${i##*/}/$j
+ %{buildroot}%{_pkgdocdir}/${i##*/}/$j
done
done
# save a bit of space
-%{_sbindir}/hardlink -cv %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+%{_sbindir}/hardlink -cv %{buildroot}%{_pkgdocdir}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc %{_defaultdocdir}/%{name}-%{version}
+%doc %{_pkgdocdir}
%{_bindir}/*
%{_pkglibdir}
%{_pkglibexecdir}
%changelog
+* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.5.0-18
+- Install docs to %%{_pkgdocdir} where available.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list