[packages/man-db] - unified macro name for package specific dir
qboosh
qboosh at pld-linux.org
Tue Jun 19 16:57:37 CEST 2018
commit 17f620e7cef94a178be6ea45a2222a9ba6cdafcc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jun 19 16:58:58 2018 +0200
- unified macro name for package specific dir
man-db.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/man-db.spec b/man-db.spec
index 2acf479..b153b36 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -43,7 +43,7 @@ Obsoletes: man-config
Obsoletes: man-whatis
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define cache /var/cache/man
+%define pkgcachedir /var/cache/man
%description
The man-db package includes five tools for browsing man-pages: man,
@@ -96,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/man-db/*.la
# install cache directory
-install -d $RPM_BUILD_ROOT%{cache}
+install -d $RPM_BUILD_ROOT%{pkgcachedir}
# install cron script for man-db creation/update
install -D -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/man-db.cron
@@ -105,7 +105,7 @@ install -D -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/man-db.cron
install -D -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
cat <<EOF > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/man-db.conf
-d %{cache} 2755 root root 1w
+d %{pkgcachedir} 2755 root root 1w
EOF
%find_lang %{name}
@@ -131,12 +131,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/whatis
%dir %{_libdir}/man-db
%attr(755,root,root) %{_libdir}/man-db/*.so
+%if "%{_libexecdir}" != "%{_libdir}"
%dir %{_libexecdir}/man-db
+%endif
%attr(755,root,root) %{_libexecdir}/man-db/zsoelim
%{_libexecdir}/man-db/globbing
%{_libexecdir}/man-db/manconv
%{systemdtmpfilesdir}/man-db.conf
-%dir %{cache}
+%dir %{pkgcachedir}
# documentation and translation
%{_mandir}/man1/apropos.1*
%{_mandir}/man1/lexgrog.1*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/man-db.git/commitdiff/17f620e7cef94a178be6ea45a2222a9ba6cdafcc
More information about the pld-cvs-commit
mailing list