[beakerlib/f19] docdir fix

Dalibor Pospisil sopos at fedoraproject.org
Tue Jun 17 13:31:14 UTC 2014


commit 63f27ccbe1bc9a037655f9c20c998591dc6f7742
Author: Dalibor Pospisil <dapospis at redhat.com>
Date:   Tue Jun 17 15:27:59 2014 +0200

    docdir fix

 beakerlib.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/beakerlib.spec b/beakerlib.spec
index deb31b6..a6553ec 100644
--- a/beakerlib.spec
+++ b/beakerlib.spec
@@ -39,9 +39,10 @@ make build
 
 
 %install
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %{!?_tmpfilesdir: %global _tmpfilesdir %{_prefix}/lib/tmpfiles.d/}
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make PKGDOCDIR=%{_pkgdocdir} DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
 
@@ -53,18 +54,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
-%dir %{_docdir}/%{name}-%{version}
-%dir %{_docdir}/%{name}-%{version}/examples
-%dir %{_docdir}/%{name}-%{version}/examples/*
+%dir %{_pkgdocdir}
+%dir %{_pkgdocdir}/examples
+%dir %{_pkgdocdir}/examples/*
 %{_datadir}/%{name}/dictionary.vim
 %{_datadir}/%{name}/*.sh
 %{_bindir}/%{name}-*
 %{_mandir}/man1/%{name}*1*
-%doc %{_docdir}/%{name}-%{version}/LICENSE
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/VERSION
-%doc %{_docdir}/%{name}-%{version}/MAINTENANCE
-%doc %{_docdir}/%{name}-%{version}/examples/*/*
+%doc %{_pkgdocdir}/LICENSE
+%doc %{_pkgdocdir}/README
+%doc %{_pkgdocdir}/VERSION
+%doc %{_pkgdocdir}/MAINTENANCE
+%doc %{_pkgdocdir}/examples/*/*
 %config %{_tmpfilesdir}/%{name}.conf
 
 


More information about the scm-commits mailing list