Accepting request 629534 from LibreOffice:Factory

- Add rplintrc to avoid bogus errors:
  * xmlsec1-rpmlintrc

- Fixed (bsc#1104876).  Added: Requires: %{libname} = %{version} to each module
  in the spec file. This will ensure that when one of the modules is installed
  the corresponding version of libxmlsec1-1 will also be installed/upgraded.

OBS-URL: https://build.opensuse.org/request/show/629534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlsec1?expand=0&rev=11

xmlsec1-rpmlintrc

@@ -0,0 +1,7 @@
+# This is not devel, those so files are loaded as plugins and there is no
+# actual versioning there
+addFilter("devel-file-in-non-devel-package")
+# Again the packages do not link yet as these are modules they are useless
+# without the main library
+addFilter("shlib-fixed-dependency")
+

xmlsec1.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Aug 16 10:22:09 UTC 2018 - tchvatal@suse.com
+
+- Add rplintrc to avoid bogus errors:
+  * xmlsec1-rpmlintrc
+
+-------------------------------------------------------------------
+Tue Aug 14 18:51:27 UTC 2018 - kallan@suse.com
+
+- Fixed (bsc#1104876).  Added: Requires: %{libname} = %{version} to each module
+  in the spec file. This will ensure that when one of the modules is installed
+  the corresponding version of libxmlsec1-1 will also be installed/upgraded.
+
 -------------------------------------------------------------------
 Tue Jun  5 20:10:17 UTC 2018 - vmiklos@collabora.co.uk
 

xmlsec1.spec

@@ -27,8 +27,9 @@ Release:        0
 Summary:        Library providing support for "XML Signature" and "XML Encryption" standards
 License:        MIT
 Group:          Productivity/Security
-Url:            http://www.aleksey.com/xmlsec/
+URL:            http://www.aleksey.com/xmlsec/
 Source0:        http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz
+Source99:       xmlsec1-rpmlintrc
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -38,7 +39,6 @@ BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(openssl)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 XML Security Library is a C library based on LibXML2  and OpenSSL.
@@ -57,6 +57,7 @@ standards "XML Digital Signature" and "XML Encryption".
 %package -n %{libgcrypt}
 Summary:        GCrypt crypto plugin for XML Security Library
 Group:          System/Libraries
+Requires:       %{libname} = %{version}
 
 %description -n %{libgcrypt}
 GCrypt plugin for XML Security Library provides GCrypt based crypto services
@@ -65,6 +66,7 @@ for the xmlsec library.
 %package -n %{libgnutls}
 Summary:        GNUTls crypto plugin for XML Security Library
 Group:          System/Libraries
+Requires:       %{libname} = %{version}
 
 %description -n %{libgnutls}
 GNUTls plugin for XML Security Library provides GNUTls based crypto services
@@ -73,6 +75,7 @@ for the xmlsec library.
 %package -n %{libnss}
 Summary:        NSS crypto plugin for XML Security Library
 Group:          System/Libraries
+Requires:       %{libname} = %{version}
 
 %description -n %{libnss}
 NSS plugin for XML Security Library provides NSS based crypto services
@@ -81,6 +84,7 @@ for the xmlsec library.
 %package -n %{libopenssl}
 Summary:        OpenSSL crypto plugin for XML Security Library
 Group:          System/Libraries
+Requires:       %{libname} = %{version}
 
 %description -n %{libopenssl}
 OpenSSL plugin for XML Security Library provides OpenSSL based crypto services
@@ -150,7 +154,7 @@ Libraries, includes, etc. for developing XML Security applications with NSS.
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 # move installed docs to include them in -devel package via %%doc magic
@@ -173,43 +177,38 @@ make %{?_smp_mflags} check check-keys check-dsig check-enc
 %postun -n %{libopenssl} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%license COPYING
-%doc README COPYING ChangeLog
+%doc README ChangeLog
-%{_mandir}/man1/xmlsec1.1*
+%{_mandir}/man1/xmlsec1.1%{?ext_man}
 %{_bindir}/xmlsec1
 
 %files -n %{libname}
-%defattr(-,root,root)
+%license COPYING
-%doc COPYING
 %{_libdir}/libxmlsec1.so.*
 
 %files -n %{libgcrypt}
-%defattr(-,root,root)
+%license COPYING
-%doc COPYING
 %{_libdir}/libxmlsec1-gcrypt.so.*
 %{_libdir}/libxmlsec1-gcrypt.so
 
 %files -n %{libgnutls}
-%defattr(-,root,root)
+%license COPYING
-%doc COPYING
 %{_libdir}/libxmlsec1-gnutls.so.*
 %{_libdir}/libxmlsec1-gnutls.so
 
 %files -n %{libnss}
-%defattr(-,root,root)
+%license COPYING
-%doc COPYING
 %{_libdir}/libxmlsec1-nss.so.*
 %{_libdir}/libxmlsec1-nss.so
 
 %files -n %{libopenssl}
-%defattr(-,root,root)
+%license COPYING
-%doc COPYING
 %{_libdir}/libxmlsec1-openssl.so.*
 %{_libdir}/libxmlsec1-openssl.so
 
 %files devel
-%defattr(-,root,root,-)
+%license COPYING
-%doc COPYING AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog NEWS
 %doc HACKING __tmp_doc/*
 %{_bindir}/xmlsec1-config
 %dir %{_includedir}/xmlsec1
@@ -221,25 +220,21 @@ make %{?_smp_mflags} check check-keys check-dsig check-enc
 %{_libdir}/pkgconfig/xmlsec1.pc
 %{_libdir}/xmlsec1Conf.sh
 %{_datadir}/aclocal/xmlsec1.m4
-%{_mandir}/man1/xmlsec1-config.1*
+%{_mandir}/man1/xmlsec1-config.1%{?ext_man}
 
 %files openssl-devel
-%defattr(-,root,root,-)
 %{_includedir}/xmlsec1/xmlsec/openssl/
 %{_libdir}/pkgconfig/xmlsec1-openssl.pc
 
 %files gcrypt-devel
-%defattr(-,root,root,-)
 %{_includedir}/xmlsec1/xmlsec/gcrypt/
 %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc
 
 %files gnutls-devel
-%defattr(-,root,root,-)
 %{_includedir}/xmlsec1/xmlsec/gnutls/
 %{_libdir}/pkgconfig/xmlsec1-gnutls.pc
 
 %files nss-devel
-%defattr(-,root,root,-)
 %{_includedir}/xmlsec1/xmlsec/nss/
 %{_libdir}/pkgconfig/xmlsec1-nss.pc