[gperftools] Install docs to %{_pkgdocdir} where available (#993798), include NEWS.

Ville Skyttä scop at fedoraproject.org
Fri Dec 6 19:43:59 UTC 2013


commit 25f500e836803a3fdf2bad71d0b77721a8e3c8df
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Dec 6 21:43:55 2013 +0200

    Install docs to %{_pkgdocdir} where available (#993798), include NEWS.
    
    - Fix bogus date in %changelog.

 gperftools.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/gperftools.spec b/gperftools.spec
index 4f05c08..7c4d7d2 100644
--- a/gperftools.spec
+++ b/gperftools.spec
@@ -1,8 +1,10 @@
 # This package used to be called "google-perftools", but it was renamed on 2012-02-03.
 
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:		gperftools
 Version:	2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
@@ -76,14 +78,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make 
 
 %install
-make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version}/ install
+make DESTDIR=%{buildroot} docdir=%{_pkgdocdir}/ install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
-# Zero files
-rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/NEWS
-
 # Delete useless files
-rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
+rm -rf %{buildroot}%{_pkgdocdir}/INSTALL
 
 %check
 # http://code.google.com/p/google-perftools/issues/detail?id=153
@@ -102,7 +101,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
 %{_mandir}/man1/*
 
 %files devel
-%{_docdir}/%{name}-%{version}/
+%{_pkgdocdir}/
 %{_includedir}/google/
 %{_includedir}/gperftools/
 %{_libdir}/*.so
@@ -112,6 +111,10 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
 %{_libdir}/*.so.*
 
 %changelog
+* Fri Dec  6 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.1-3
+- Install docs to %%{_pkgdocdir} where available (#993798), include NEWS.
+- Fix bogus date in %%changelog.
+
 * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 2.1-2
 - Perl 5.18 rebuild
 
@@ -272,7 +275,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL
 * Mon Apr 23 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.91-1
 - alright, lets see if this works now.
 
-* Wed Oct 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3-2
+* Wed Oct 12 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3-2
 - change group to Development/Tools
 
 * Mon Oct 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3-1


More information about the scm-commits mailing list