[byobu] Install docs to %{_pkgdocdir} where available (#993689).
Ville Skyttä
scop at fedoraproject.org
Thu Dec 12 22:09:42 UTC 2013
commit a7b75eaa7e4fb91ae99ac8c74513d23349057358
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Dec 13 00:09:42 2013 +0200
Install docs to %{_pkgdocdir} where available (#993689).
- Fix bogus dates in %changelog.
byobu.spec | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/byobu.spec b/byobu.spec
index 86ad375..e7845c3 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: byobu
Version: 5.21
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Light-weight, configurable window manager built upon GNU screen
Group: Applications/System
@@ -41,7 +43,7 @@ for i in `grep -Ri BYOBU_PREFIX/lib/ * | awk -F: '{print $1}' | uniq`; do
sed -i "s#BYOBU_PREFIX/lib/#BYOBU_PREFIX/libexec/#g" $i;
done
# fix path for help file
-sed -i "s#DOC=BYOBU_PREFIX+'/share/doc/'+PKG#DOC=BYOBU_PREFIX+'/share/doc/'+PKG+'-%{version}'#g" usr/bin/byobu-config
+sed -i "s#DOC=BYOBU_PREFIX+'/share/doc/'+PKG#DOC='%{_pkgdocdir}'#g" usr/bin/byobu-config
# set default fedora windows
cp -p %{SOURCE1} usr/share/byobu/windows/common
# fix path from lib to libexec by modified Makefile.am and in
@@ -56,14 +58,12 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install
-# remove doc from make install
-mv %{buildroot}%{_docdir}/%{name}/ %{buildroot}%{_docdir}/%{name}-%{version}
+make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" docdir=%{_pkgdocdir} install
rm -rf %{buildroot}%{_sysconfdir}/profile.d
# remove apport which is not available in fedora
rm %{buildroot}/%{_libexecdir}/%{name}/apport
sed -i 's#status\[\"apport\"\]=0##g' %{buildroot}%{_bindir}/byobu-config
-cp -p README COPYING %{buildroot}%{_docdir}/%{name}-%{version}
+cp -p README COPYING %{buildroot}%{_pkgdocdir}
for po in po/*.po
do
lang=${po#po/}
@@ -81,12 +81,11 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-#%doc README COPYING
%dir %{_datadir}/%{name}
%dir %{_libexecdir}/%{name}
%dir %{_sysconfdir}/%{name}
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/*
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/*
%{_bindir}/%{name}*
%if 0%{?rhel} == 5
%{_datadir}/applications/*.desktop
@@ -99,6 +98,10 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/%{name}/*
%changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 5.21-7
+- Install docs to %%{_pkgdocdir} where available (#993689).
+- Fix bogus dates in %%changelog.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.21-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -111,10 +114,10 @@ rm -rf %{buildroot}
* Sat Aug 25 2012 Jan Klepek <jan.klepek at, gmail.com> - 5.21-3
- another fix into documentation
-* Sun Aug 18 2012 Jan Klepek <jan.klepek at, gmail.com> - 5.21-2
+* Sun Aug 19 2012 Jan Klepek <jan.klepek at, gmail.com> - 5.21-2
- fixed documentation
-* Sun Aug 18 2012 Jan Klepek <jan.klepek at, gmail.com> - 5.21-1
+* Sun Aug 19 2012 Jan Klepek <jan.klepek at, gmail.com> - 5.21-1
- new minor release
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.17-2
More information about the scm-commits
mailing list