[gflags] Fix doc-files installation
Peter Lemenkov
peter at fedoraproject.org
Tue Aug 6 13:27:27 UTC 2013
commit f162ccfcf899a17af0b87c97cb6e87d901731f4e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Aug 6 16:24:37 2013 +0400
Fix doc-files installation
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
gflags.spec | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gflags.spec b/gflags.spec
index 11ced60..860b35b 100644
--- a/gflags.spec
+++ b/gflags.spec
@@ -2,14 +2,13 @@
Name: gflags
Version: 1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library for commandline flag processing
Group: Development/Tools
License: BSD
URL: http://code.google.com/p/google-%{name}/
Source0: http://google-%{name}.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-setuptools-devel
%description
@@ -23,7 +22,7 @@ they're used.
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package contains development files for %{name}.
@@ -41,10 +40,12 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=%{buildroot} INSTALL="install -p"
-find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+find %{buildroot} -type f -name "*.la" -delete
+
+# Remove preinstaled versioned doc-files
+rm -rf %{buildroot}/%{_datadir}/doc/%{name}-%{version}
%check
@@ -52,24 +53,19 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
# disable test suite
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc ChangeLog README COPYING
+%doc AUTHORS ChangeLog README COPYING
%{_bindir}/gflags_completions.sh
%{_libdir}/libgflags.so.*
%{_libdir}/libgflags_nothreads.so.*
%files devel
-%defattr(-,root,root,-)
%doc doc/designstyle.css doc/gflags.html
%{_libdir}/libgflags.so
%{_libdir}/libgflags_nothreads.so
@@ -79,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/google/*.h
%changelog
+* Tue Aug 06 2013 Peter Lemenkov <lemenkov at gmail.com> - 1.3-7
+- Cleanup spec-file (removed EL6/FC6 stuff)
+- Fix doc-files installation
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list