[libhtp] Fix a few issues raised during package review

[Mathieu Bridon]

commit fc715154d33e2c41c5e73ed191877780b120d50c
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Thu Jan 26 16:36:41 2012 +0800

    Fix a few issues raised during package review
    
    This addresses Matthieu's feedback:
        https://bugzilla.redhat.com/show_bug.cgi?id=744977#c3
    
    As well as Martin's:
        https://bugzilla.redhat.com/show_bug.cgi?id=744977#c4

 libhtp.spec |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/libhtp.spec b/libhtp.spec
index d73cada..7b8d6e0 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.1.%{snapver}%{?dist}
+Release:       0.2.%{snapver}%{?dist}
 
 Summary:       Security-aware parser for the HTTP protocol and the related bits and pieces
 License:       ASL 2.0
@@ -33,9 +33,8 @@ follows:
 
 
 %package devel
-Group: Development/Libraries
-Summary: Development headers and libraries for %{name}
-Requires: %{name} = %{version}-%{release}
+Summary:       Development headers and libraries for %{name}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Development headers and libraries for %{name}.
@@ -54,10 +53,10 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # Remove installed libtools files
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' \;
+find %{buildroot} -name '*.la' -exec rm -f '{}' \;
 
 
 %post -p /sbin/ldconfig
@@ -66,19 +65,27 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' \;
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS LICENSE COPYING
+%doc AUTHORS COPYING LICENSE NOTICE README
 %{_libdir}/%{name}*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%doc AUTHORS LICENSE COPYING
 %{_libdir}/%{name}.so
 %{_includedir}/htp
 %{_libdir}/pkgconfig/htp.pc
 
 
 %changelog
+* 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.
+  - Fix requirement of the main package in the -devel subpackage.
+  - Remove the useless %%defattr lines.
+  - Add the README and NOTICE files as documentation.
+  - Remove the documentation files from -devel subpackage if they are already
+    included in the main package, since the former requires the latter anyway.
+- Use the buildroot macro rather than the RPM_BUILD_ROOT variable, to be
+  consistent (I'm not using any other variables, only macros).
+
 * Fri Oct 21 2011 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.0-0.1.20111021.git537ac17
 - New upstream snapshot, to fix the two issues I was working around in the spec:
   - Spurious executable permissions on *.c and *.h files