From 49fb55b38f923f578c7fa4689e8d46c01db513c7c22bddc8ee5e262068dbf262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Aug 2018 10:18:26 +0000 Subject: [PATCH 1/2] Accepting request 629443 from home:kallan:branches:LibreOffice:Factory - 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/629443 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/xmlsec1?expand=0&rev=20 --- xmlsec1.changes | 7 +++++++ xmlsec1.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/xmlsec1.changes b/xmlsec1.changes index d0251fc..dbb47c5 100644 --- a/xmlsec1.changes +++ b/xmlsec1.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/xmlsec1.spec b/xmlsec1.spec index 8d8a0cf..ccc7c81 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -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 From aa3a21f0f6bdbbbc510da34086b73203957a5ac786908ac93033f480ff4f955c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Aug 2018 10:22:25 +0000 Subject: [PATCH 2/2] - Add rplintrc to avoid bogus errors: * xmlsec1-rpmlintrc OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/xmlsec1?expand=0&rev=21 --- xmlsec1-rpmlintrc | 7 +++++++ xmlsec1.changes | 6 ++++++ xmlsec1.spec | 37 ++++++++++++++----------------------- 3 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 xmlsec1-rpmlintrc diff --git a/xmlsec1-rpmlintrc b/xmlsec1-rpmlintrc new file mode 100644 index 0000000..8c96d19 --- /dev/null +++ b/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") + diff --git a/xmlsec1.changes b/xmlsec1.changes index dbb47c5..7a01fbd 100644 --- a/xmlsec1.changes +++ b/xmlsec1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/xmlsec1.spec b/xmlsec1.spec index ccc7c81..b823d44 100644 --- a/xmlsec1.spec +++ b/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. @@ -154,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 @@ -177,43 +177,38 @@ make %{?_smp_mflags} check check-keys check-dsig check-enc %postun -n %{libopenssl} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc README COPYING ChangeLog -%{_mandir}/man1/xmlsec1.1* +%license COPYING +%doc README ChangeLog +%{_mandir}/man1/xmlsec1.1%{?ext_man} %{_bindir}/xmlsec1 %files -n %{libname} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxmlsec1.so.* %files -n %{libgcrypt} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxmlsec1-gcrypt.so.* %{_libdir}/libxmlsec1-gcrypt.so %files -n %{libgnutls} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxmlsec1-gnutls.so.* %{_libdir}/libxmlsec1-gnutls.so %files -n %{libnss} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxmlsec1-nss.so.* %{_libdir}/libxmlsec1-nss.so %files -n %{libopenssl} -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libxmlsec1-openssl.so.* %{_libdir}/libxmlsec1-openssl.so %files devel -%defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog NEWS +%license COPYING +%doc AUTHORS ChangeLog NEWS %doc HACKING __tmp_doc/* %{_bindir}/xmlsec1-config %dir %{_includedir}/xmlsec1 @@ -225,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