[libhtp] Fix doc installing (the previous way worked on Fedora but not on EPEL 6)

Mathieu Bridon bochecha at fedoraproject.org
Fri Jan 27 03:05:18 UTC 2012


commit 74c0b0f84ef3538527c76f5679b2790a23d235f4
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Fri Jan 27 11:00:43 2012 +0800

    Fix doc installing (the previous way worked on Fedora but not on EPEL 6)

 libhtp.spec |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/libhtp.spec b/libhtp.spec
index 1600ff8..d1a6e18 100644
--- a/libhtp.spec
+++ b/libhtp.spec
@@ -6,7 +6,7 @@ Name:          libhtp
 
 # Note: This is a pre-release VCS snapshot
 Version:       0.3.0
-Release:       0.3.%{snapver}%{?dist}
+Release:       0.4.%{snapver}%{?dist}
 
 Summary:       Security-aware parser for the HTTP protocol and the related bits and pieces
 License:       ASL 2.0
@@ -72,11 +72,6 @@ make doxygen
 %install
 make install DESTDIR=%{buildroot}
 
-# Install the docs
-install -d %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -a docs/doxygen/html %{buildroot}%{_docdir}/%{name}-%{version}/
-cp -a docs/doxygen/latex %{buildroot}%{_docdir}/%{name}-%{version}/
-
 # Remove installed libtools files
 find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 
@@ -88,8 +83,6 @@ find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 
 %files
 %doc AUTHORS COPYING LICENSE NOTICE README
-%exclude %{_docdir}/%{name}-%{version}/html
-%exclude %{_docdir}/%{name}-%{version}/latex
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -98,11 +91,14 @@ find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 %{_libdir}/pkgconfig/htp.pc
 
 %files doc
-%doc %{_docdir}/%{name}-%{version}/html
-%doc %{_docdir}/%{name}-%{version}/latex
+%doc docs/doxygen/html
+%doc docs/doxygen/latex
 
 
 %changelog
+* Fri Jan 27 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.0-0.4.20120126.git53e5901
+- Fix doc installing (the previous way worked on Fedora but not on EPEL 6).
+
 * Thu Jan 26 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.0-0.3.20120126.git53e5901
 - New upstream VCS snapshot, including bug fixes, better unit tests and
   integration of the documentation to the build/install tool chain.


More information about the scm-commits mailing list