From 3abf0eaf49adc05040b8eb33ffefbcd113a05cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Tue, 6 Aug 2013 16:29:08 +0200 Subject: [PATCH] Reflect docdir changes (RHBZ #993921). - Fix bogus %changelog date. --- qhull.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/qhull.spec b/qhull.spec index 76e81ca..cd61860 100644 --- a/qhull.spec +++ b/qhull.spec @@ -1,7 +1,7 @@ Summary: General dimension convex hull programs Name: qhull Version: 2003.1 -Release: 21%{?dist} +Release: 22%{?dist} License: Qhull Group: System Environment/Libraries Source0: http://www.qhull.org/download/qhull-%{version}.tar.gz @@ -16,6 +16,9 @@ Patch4: qhull-2003.1-config.patch URL: http://www.qhull.org +# To be dropped when F19 reaches EOL +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} + Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -63,7 +66,7 @@ sed -e 's|@prefix@|%{_prefix}|' \ %install make DESTDIR=$RPM_BUILD_ROOT \ - docdir=%{_docdir}/%{name}-%{version} install + docdir=%{_pkgdocdir} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la install -m644 -D qhull.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/qhull.pc @@ -75,7 +78,7 @@ install -m644 -D qhull.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/qhull.pc %files %defattr(-,root,root) -%doc %{_docdir}/%{name}-%{version} +%doc %{_pkgdocdir} %_bindir/* %_libdir/*.so.* %_mandir/man1/* @@ -88,6 +91,10 @@ install -m644 -D qhull.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/qhull.pc %changelog +* Tue Aug 06 2013 Ralf Corsépius - 2003.1-22 +- Reflect docdir changes (RHBZ #993921). +- Fix bogus %%changelog date. + * Sun Aug 04 2013 Fedora Release Engineering - 2003.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -149,7 +156,7 @@ install -m644 -D qhull.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/qhull.pc * Sun May 22 2005 Jeremy Katz - 2003.1-4 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Wed Apr 6 2005 Michael Schwendt - rebuilt * Sun Aug 08 2004 Ralf Corsepius - 2003.1-0.fdr.2