[libhtp] New upstream VCS snapshot

[Mathieu Bridon]

commit f5f45f2c78ef745b2b147c1cd1955f4c6cc4ec03
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Thu Jan 26 17:07:20 2012 +0800

    New upstream VCS snapshot
    
    A few bugs were fixed upstream, and they now make it easier to build the
    docs.
    
    Since the reviewer asked me to build the docs, that's a good excuse to
    update before pushing to Fedora.

 libhtp.spec |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/libhtp.spec b/libhtp.spec
index 7b8d6e0..1600ff8 100644
--- a/libhtp.spec
+++ b/libhtp.spec
@@ -1,12 +1,12 @@
-%global        snapdate   20111021
-%global        snaphash   537ac17
+%global        snapdate   20120126
+%global        snaphash   53e5901
 %global        snapver    %{snapdate}.git%{snaphash}
 
 Name:          libhtp
 
 # Note: This is a pre-release VCS snapshot
 Version:       0.3.0
-Release:       0.2.%{snapver}%{?dist}
+Release:       0.3.%{snapver}%{?dist}
 
 Summary:       Security-aware parser for the HTTP protocol and the related bits and pieces
 License:       ASL 2.0
@@ -14,7 +14,7 @@ URL:           http://www.libhtp.org
 
 # Upstream doesn't publish release tarballs yet, so we make one:
 #     $ git clone git://github.com/ironbee/libhtp.git && cd libhtp
-#     $ git archive --format=tar --prefix=libhtp-0.3.0/ 537ac17 | xz -z >libhtp-0.3.0-20111021.git537ac17.tar.xz
+#     $ git archive --format=tar --prefix=libhtp-0.3.0/ 53e5901 | xz -z >libhtp-0.3.0-20120126.git53e5901.tar.xz
 Source0:       %{name}-%{version}-%{snapver}.tar.xz
 
 # Upstream doesn't publish release tarballs yet, so we need the autotools stuff
@@ -22,6 +22,9 @@ BuildRequires: autoconf automake libtool
 
 BuildRequires: zlib-devel
 
+# Required to generate the API docs
+BuildRequires: doxygen graphviz
+
 %description
 LibHTP is a security-aware parser for the HTTP protocol and the related bits
 and pieces. The goals of the project, in the order of importance, are as
@@ -40,6 +43,15 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 Development headers and libraries for %{name}.
 
 
+%package doc
+Summary:       Documentation for %{name}
+Requires:      %{name} = %{version}-%{release}
+BuildArch:     noarch
+
+%description doc
+Documentation (in HTML, Latex and PDF formats) for %{name}.
+
+
 %prep
 %setup -q
 
@@ -48,13 +60,23 @@ Development headers and libraries for %{name}.
 # Upstream doesn't publish release tarballs yet, so we need to run autoreconf
 autoreconf -i
 
-%configure --disable-static
+%configure --disable-static --with-doxygen=doxygen
 make %{?_smp_mflags}
 
+# Make it easier to install the HTML docs
+sed -i 's|^\(HTML_OUTPUT *=\).*|\1|' docs/doxygen.conf
+
+# Build the documentation
+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 '{}' \;
 
@@ -66,6 +88,8 @@ 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
@@ -73,8 +97,17 @@ find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 %{_includedir}/htp
 %{_libdir}/pkgconfig/htp.pc
 
+%files doc
+%doc %{_docdir}/%{name}-%{version}/html
+%doc %{_docdir}/%{name}-%{version}/latex
+
 
 %changelog
+* 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.
+- Build the API docs and add it to the new -doc subpackage.
+
 * Thu Jan 26 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.0-0.2.20111021.git537ac17
 - Fix a few issues raised during package review:
   - Remove the useless Group tag for the -devel subpackage.