[xmlsec1] Fix duplicate documentation (#1001250)

[Michael Schwendt]

commit 0125087aa5e1ce101e20b657a98134036c06d53e
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Dec 13 21:30:40 2013 +0100

    Fix duplicate documentation (#1001250)
    
    - Turn on verbose build output via V=1 make
    - Use %?_isa in explicit package deps
    - Fix base package Group tag to "System Environment/Libraries"
    - Remove %defattr

 xmlsec1.spec |   74 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 38 insertions(+), 36 deletions(-)
---
diff --git a/xmlsec1.spec b/xmlsec1.spec
index 8f4246f..224c85e 100644
--- a/xmlsec1.spec
+++ b/xmlsec1.spec
@@ -1,9 +1,9 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.19
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: MIT
-Group: Development/Libraries
+Group: System Environment/Libraries
 Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.aleksey.com/xmlsec/
@@ -32,11 +32,14 @@ standards "XML Digital Signature" and "XML Encryption".
 Summary: Libraries, includes, etc. to develop applications with XML Digital Signatures and XML Encryption support.
 Group: Development/Libraries
 Requires: xmlsec1%{?_isa} = %{version}-%{release}
-Requires: libxml2-devel >= 2.6.0
-Requires: libxslt-devel >= 1.1.0
-Requires: openssl-devel >= 0.9.6
-Requires: zlib-devel
+Requires: libxml2-devel%{?_isa} >= 2.6.0
+Requires: libxslt-devel%{?_isa} >= 1.1.0
+Requires: openssl-devel%{?_isa} >= 0.9.6
+Requires: zlib-devel%{?_isa}
+# pkgconfig deps are automatic in Fedora and EL>=6
+%if 0%{?rhel} == 5
 Requires: pkgconfig
+%endif
 
 %description devel
 Libraries, includes, etc. you can use to develop applications with XML Digital
@@ -45,7 +48,7 @@ Signatures and XML Encryption support.
 %package openssl
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1 = %{version}-%{release}
+Requires: xmlsec1%{?_isa} = %{version}-%{release}
 
 %description openssl
 OpenSSL plugin for XML Security Library provides OpenSSL based crypto services
@@ -54,8 +57,8 @@ for the xmlsec library.
 %package openssl-devel
 Summary: OpenSSL crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1-devel = %{version}-%{release}
-Requires: xmlsec1-openssl = %{version}-%{release}
+Requires: xmlsec1-devel%{?_isa} = %{version}-%{release}
+Requires: xmlsec1-openssl%{?_isa} = %{version}-%{release}
 
 %description openssl-devel
 Libraries, includes, etc. for developing XML Security applications with OpenSSL
@@ -72,8 +75,8 @@ for the xmlsec library.
 %package gcrypt-devel
 Summary: GCrypt crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1-devel = %{version}-%{release}
-Requires: xmlsec1-gnutls-devel = %{version}-%{release}
+Requires: xmlsec1-devel%{?_isa} = %{version}-%{release}
+Requires: xmlsec1-gnutls-devel%{?_isa} = %{version}-%{release}
 
 %description gcrypt-devel
 Libraries, includes, etc. for developing XML Security applications with GCrypt.
@@ -90,10 +93,10 @@ for the xmlsec library.
 %package gnutls-devel
 Summary: GNUTls crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1-devel = %{version}-%{release}
-Requires: xmlsec1-openssl-devel = %{version}-%{release}
-Requires: libgcrypt-devel >= 1.2.0
-Requires: gnutls-devel >= 1.0.20
+Requires: xmlsec1-devel%{?_isa} = %{version}-%{release}
+Requires: xmlsec1-openssl-devel%{?_isa} = %{version}-%{release}
+Requires: libgcrypt-devel%{?_isa} >= 1.2.0
+Requires: gnutls-devel%{?_isa} >= 1.0.20
 
 %description gnutls-devel
 Libraries, includes, etc. for developing XML Security applications with GNUTls.
@@ -110,10 +113,10 @@ for the xmlsec library
 %package nss-devel
 Summary: NSS crypto plugin for XML Security Library
 Group: Development/Libraries
-Requires: xmlsec1-devel = %{version}-%{release}
-Requires: xmlsec1-nss = %{version}-%{release}
-Requires: nss-devel >= 3.2
-Requires: nspr-devel
+Requires: xmlsec1-devel%{?_isa} = %{version}-%{release}
+Requires: xmlsec1-nss%{?_isa} = %{version}-%{release}
+Requires: nss-devel%{?_isa} >= 3.2
+Requires: nspr-devel%{?_isa}
 
 %description nss-devel
 Libraries, includes, etc. for developing XML Security applications with NSS.
@@ -127,7 +130,7 @@ autoreconf -if
 %configure --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make
+V=1 make
 
 # positively ugly but only sane way to get around #192756
 sed 's+/lib64+/$archlib+g' < xmlsec1-config | sed 's+/lib+/$archlib+g' | sed 's+ -DXMLSEC_NO_SIZE_T++' > xmlsec1-config.$$ && mv xmlsec1-config.$$ xmlsec1-config
@@ -142,8 +145,12 @@ mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# move installed docs to include them in -devel package via %%doc magic
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv ${RPM_BUILD_ROOT}%{_docdir}/xmlsec1/* __tmp_doc
+
 %clean
-rm -fr %{buildroot}
+rm -fr ${RPM_BUILD_ROOT}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -155,14 +162,12 @@ rm -fr %{buildroot}
 %postun openssl -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog NEWS README Copyright
-%doc %{_mandir}/man1/xmlsec1.1*
+%{_mandir}/man1/xmlsec1.1*
 %{_libdir}/libxmlsec1.so.*
 %{_bindir}/xmlsec1
 
 %files devel
-%defattr(-, root, root, -)
 %{_bindir}/xmlsec1-config
 %dir %{_includedir}/xmlsec1
 %dir %{_includedir}/xmlsec1/xmlsec
@@ -172,53 +177,50 @@ rm -fr %{buildroot}
 %{_libdir}/libxmlsec1.so
 %{_libdir}/pkgconfig/xmlsec1.pc
 %{_libdir}/xmlsec1Conf.sh
-%dir %{_docdir}/xmlsec1
-%{_docdir}/xmlsec1/*
-%doc AUTHORS HACKING ChangeLog NEWS README Copyright
-%doc %{_mandir}/man1/xmlsec1-config.1*
 %{_datadir}/aclocal/xmlsec1.m4
+%{_mandir}/man1/xmlsec1-config.1*
+%doc HACKING __tmp_doc/*
 
 %files openssl
-%defattr(-, root, root, -)
 %{_libdir}/libxmlsec1-openssl.so.*
 %{_libdir}/libxmlsec1-openssl.so
 
 %files openssl-devel
-%defattr(-, root, root, -)
 %{_includedir}/xmlsec1/xmlsec/openssl/
 %{_libdir}/pkgconfig/xmlsec1-openssl.pc
 
 %files gcrypt
-%defattr(-, root, root, -)
 %{_libdir}/libxmlsec1-gcrypt.so.*
 %{_libdir}/libxmlsec1-gcrypt.so
 
 %files gcrypt-devel
-%defattr(-, root, root, -)
 %{_includedir}/xmlsec1/xmlsec/gcrypt/
 %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc
 
 %files gnutls
-%defattr(-, root, root, -)
 %{_libdir}/libxmlsec1-gnutls.so.*
 %{_libdir}/libxmlsec1-gnutls.so
 
 %files gnutls-devel
-%defattr(-, root, root, -)
 %{_includedir}/xmlsec1/xmlsec/gnutls/
 %{_libdir}/pkgconfig/xmlsec1-gnutls.pc
 
 %files nss
-%defattr(-, root, root, -)
 %{_libdir}/libxmlsec1-nss.so.*
 %{_libdir}/libxmlsec1-nss.so
 
 %files nss-devel
-%defattr(-, root, root, -)
 %{_includedir}/xmlsec1/xmlsec/nss/
 %{_libdir}/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Fri Dec 13 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.19-3
+- Fix duplicate documentation (#1001250)
+- Turn on verbose build output via V=1 make
+- Use %%?_isa in explicit package deps
+- Fix base package Group tag to "System Environment/Libraries"
+- Remove %%defattr
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild