[berusky] Install docs to %{_pkgdocdir} where available (#993683).
Ville Skyttä
scop at fedoraproject.org
Thu Dec 12 21:40:22 UTC 2013
commit 4386bd4106f459d75a934dcac8375c1fd8b35520
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Thu Dec 12 23:40:25 2013 +0200
Install docs to %{_pkgdocdir} where available (#993683).
- Fix bogus dates in %changelog.
berusky.spec | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/berusky.spec b/berusky.spec
index 3fdad54..e9b409f 100644
--- a/berusky.spec
+++ b/berusky.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Summary: Sokoban clone
Name: berusky
Version: 1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Amusements/Games
Source: http://www.anakreon.cz/download/%{name}-%{version}.tar.gz
@@ -34,19 +36,14 @@ make %{?_smp_mflags}
%install
%make_install
-mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
-
-pushd %{buildroot}/usr/doc/berusky
-mv * %{buildroot}%{_docdir}/%{name}-%{version}
-popd
+mkdir -p %{buildroot}%{_pkgdocdir}
+mv %{buildroot}/usr/doc/berusky/* %{buildroot}%{_pkgdocdir}
rm -rf %{buildroot}/%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/NEWS
%post
touch --no-create %{_datadir}/icons/hicolor || :
@@ -61,18 +58,18 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
fi
%files
-%doc %dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/AUTHORS
-%doc %{_docdir}/%{name}-%{version}/COPYING
-%doc %{_docdir}/%{name}-%{version}/ChangeLog
-%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/TODO
-
+%{_pkgdocdir}
+%exclude %{_pkgdocdir}/INSTALL
+%exclude %{_pkgdocdir}/NEWS
%{_bindir}/berusky
%{_datadir}/applications/berusky.desktop
%{_datadir}/icons/hicolor/32x32/apps/berusky.png
%changelog
+* Thu Dec 12 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.6-4
+- Install docs to %%{_pkgdocdir} where available (#993683).
+- Fix bogus dates in %%changelog.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -82,7 +79,7 @@ fi
- fix url and sourceurl
- fix desktop file to follow specification
-* Sat Dec 9 2012 Martin Stransky <stransky at redhat.com> 1.6-1
+* Sun Dec 9 2012 Martin Stransky <stransky at redhat.com> 1.6-1
- New upstream version (1.6)
* Sat Sep 15 2012 Martin Stransky <stransky at redhat.com> 1.5-2
@@ -134,7 +131,7 @@ fi
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1-6
- Rebuild for selinux ppc32 issue.
-* Thu Jun 26 2007 Martin Stransky <stransky at redhat.com> 1.1-5
+* Tue Jun 26 2007 Martin Stransky <stransky at redhat.com> 1.1-5
- added a menu entry and an icon
* Wed May 23 2007 Martin Stransky <stransky at redhat.com> 1.1-4
More information about the scm-commits
mailing list