From 203fc4a22787d58c2f5b0fd16558b8a52e713bfc9526ea9cbe70c119257e9ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 May 2016 10:56:13 +0000 Subject: [PATCH] - Version update to 1.2.22: * see the ChangeLog for most detailed output * openssl 1.1 support * Few features from libreoffice for integrated * Run the testsuite OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/xmlsec1?expand=0&rev=6 --- xmlsec1-1.2.20.tar.gz | 3 - xmlsec1-1.2.22.tar.gz | 3 + xmlsec1.changes | 9 ++ xmlsec1.spec | 236 ++++++++++++++++++++---------------------- 4 files changed, 123 insertions(+), 128 deletions(-) delete mode 100644 xmlsec1-1.2.20.tar.gz create mode 100644 xmlsec1-1.2.22.tar.gz diff --git a/xmlsec1-1.2.20.tar.gz b/xmlsec1-1.2.20.tar.gz deleted file mode 100644 index c292eb4..0000000 --- a/xmlsec1-1.2.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 -size 1769329 diff --git a/xmlsec1-1.2.22.tar.gz b/xmlsec1-1.2.22.tar.gz new file mode 100644 index 0000000..570c008 --- /dev/null +++ b/xmlsec1-1.2.22.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c06bf161c565b907a499e6d906f0b640f063b2b4efd2b471048ac5b3c1ad527 +size 1792363 diff --git a/xmlsec1.changes b/xmlsec1.changes index e6ca497..012e912 100644 --- a/xmlsec1.changes +++ b/xmlsec1.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 25 10:49:08 UTC 2016 - tchvatal@suse.com + +- Version update to 1.2.22: + * see the ChangeLog for most detailed output + * openssl 1.1 support + * Few features from libreoffice for integrated + * Run the testsuite + ------------------------------------------------------------------- Thu Sep 3 12:39:49 UTC 2015 - astieger@suse.com diff --git a/xmlsec1.spec b/xmlsec1.spec index 8378341..2436701 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ # # spec file for package xmlsec1 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %global libgnutls libxmlsec1-gnutls1 %global libnss libxmlsec1-nss1 Name: xmlsec1 -Version: 1.2.20 +Version: 1.2.22 Release: 0 Summary: Library providing support for "XML Signature" and "XML Encryption" standards License: MIT @@ -45,12 +45,6 @@ XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security standards "XML Digital Signature" and "XML Encryption". -%files -%defattr(-,root,root) -%doc README COPYING -%{_mandir}/man1/xmlsec1.1* -%{_bindir}/xmlsec1 - %package -n %{libname} Summary: Library providing support for "XML Signature" and "XML Encryption" standards Group: System/Libraries @@ -60,15 +54,6 @@ XML Security Library is a C library based on LibXML2 and OpenSSL. The library was created with a goal to support major XML security standards "XML Digital Signature" and "XML Encryption". -%post -n %{libname} -p /sbin/ldconfig - -%postun -n %{libname} -p /sbin/ldconfig - -%files -n %{libname} -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libxmlsec1.so.* - %package -n %{libgcrypt} Summary: GCrypt crypto plugin for XML Security Library Group: System/Libraries @@ -77,15 +62,6 @@ Group: System/Libraries GCrypt plugin for XML Security Library provides GCrypt based crypto services for the xmlsec library. -%post -n %{libgcrypt} -p /sbin/ldconfig - -%postun -n %{libgcrypt} -p /sbin/ldconfig - -%files -n %{libgcrypt} -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libxmlsec1-gcrypt.so.* - %package -n %{libgnutls} Summary: GNUTls crypto plugin for XML Security Library Group: System/Libraries @@ -94,15 +70,6 @@ Group: System/Libraries GNUTls plugin for XML Security Library provides GNUTls based crypto services for the xmlsec library. -%post -n %{libgnutls} -p /sbin/ldconfig - -%postun -n %{libgnutls} -p /sbin/ldconfig - -%files -n %{libgnutls} -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libxmlsec1-gnutls.so.* - %package -n %{libnss} Summary: NSS crypto plugin for XML Security Library Group: System/Libraries @@ -111,15 +78,6 @@ Group: System/Libraries NSS plugin for XML Security Library provides NSS based crypto services for the xmlsec library. -%post -n %{libnss} -p /sbin/ldconfig - -%postun -n %{libnss} -p /sbin/ldconfig - -%files -n %{libnss} -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libxmlsec1-nss.so.* - %package -n %{libopenssl} Summary: OpenSSL crypto plugin for XML Security Library Group: System/Libraries @@ -128,24 +86,123 @@ Group: System/Libraries OpenSSL plugin for XML Security Library provides OpenSSL based crypto services for the xmlsec library. -%post -n %{libopenssl} -p /sbin/ldconfig - -%postun -n %{libopenssl} -p /sbin/ldconfig - -%files -n %{libopenssl} -%defattr(-,root,root) -%doc COPYING -%{_libdir}/libxmlsec1-openssl.so.* - %package devel Summary: Libraries, includes for XML Signatures/Encryption -Group: Development/Libraries +Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: libxml2-devel >= 2.6.0 Requires: libxslt-devel >= 1.1.0 Requires: openssl-devel >= 0.9.6 Requires: zlib-devel +%description devel +Libraries, includes, etc. you can use to develop applications with XML Digital +Signatures and XML Encryption support. + +%package openssl-devel +Summary: OpenSSL crypto plugin for XML Security Library +Group: Development/Libraries/C and C++ +Requires: %{libopenssl} = %{version} +Requires: %{name}-devel = %{version} + +%description openssl-devel +Libraries, includes, etc. for developing XML Security applications with OpenSSL + +%package gcrypt-devel +Summary: GCrypt crypto plugin for XML Security Library +Group: Development/Libraries/C and C++ +Requires: %{libgcrypt} = %{version} +Requires: %{name}-devel = %{version} + +%description gcrypt-devel +Libraries, includes, etc. for developing XML Security applications with GCrypt. + +%package gnutls-devel +Summary: GNUTls crypto plugin for XML Security Library +Group: Development/Libraries/C and C++ +Requires: %{libgnutls} = %{version} +Requires: %{name}-devel = %{version} +Requires: %{name}-openssl-devel = %{version} +Requires: gnutls-devel >= 1.0.20 +Requires: libgcrypt-devel >= 1.2.0 + +%description gnutls-devel +Libraries, includes, etc. for developing XML Security applications with GNUTls. + +%package nss-devel +Summary: NSS crypto plugin for XML Security Library +Group: Development/Libraries/C and C++ +Requires: %{libnss} = %{version} +Requires: %{name}-devel = %{version} +Requires: mozilla-nspr-devel +Requires: mozilla-nss-devel >= 3.2 + +%description nss-devel +Libraries, includes, etc. for developing XML Security applications with NSS. + +%prep +%setup -q + +%build +%configure \ + --disable-static \ + --disable-silent-rules +make %{?_smp_mflags} + +%install +make %{?_smp_mflags} DESTDIR=%{buildroot} install +find %{buildroot} -type f -name "*.la" -delete -print + +# move installed docs to include them in -devel package via %%doc magic +rm -rf __tmp_doc ; mkdir __tmp_doc +mv %{buildroot}%{_datadir}/doc/xmlsec1/* __tmp_doc +rmdir %{buildroot}%{_datadir}/doc/xmlsec1 + +%check +make %{?_smp_mflags} check check-keys check-dsig check-enc + +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig +%post -n %{libgcrypt} -p /sbin/ldconfig +%postun -n %{libgcrypt} -p /sbin/ldconfig +%post -n %{libgnutls} -p /sbin/ldconfig +%postun -n %{libgnutls} -p /sbin/ldconfig +%post -n %{libnss} -p /sbin/ldconfig +%postun -n %{libnss} -p /sbin/ldconfig +%post -n %{libopenssl} -p /sbin/ldconfig +%postun -n %{libopenssl} -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc README COPYING ChangeLog +%{_mandir}/man1/xmlsec1.1* +%{_bindir}/xmlsec1 + +%files -n %{libname} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libxmlsec1.so.* + +%files -n %{libgcrypt} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libxmlsec1-gcrypt.so.* + +%files -n %{libgnutls} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libxmlsec1-gnutls.so.* + +%files -n %{libnss} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libxmlsec1-nss.so.* + +%files -n %{libopenssl} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libxmlsec1-openssl.so.* + %files devel %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog NEWS @@ -162,99 +219,28 @@ Requires: zlib-devel %{_datadir}/aclocal/xmlsec1.m4 %{_mandir}/man1/xmlsec1-config.1* -%description devel -Libraries, includes, etc. you can use to develop applications with XML Digital -Signatures and XML Encryption support. - -%package openssl-devel -Summary: OpenSSL crypto plugin for XML Security Library -Group: Development/Libraries/C and C++ -Requires: %{libopenssl} = %{version} -Requires: %{name}-devel = %{version} - -%description openssl-devel -Libraries, includes, etc. for developing XML Security applications with OpenSSL - %files openssl-devel %defattr(-,root,root,-) %{_libdir}/libxmlsec1-openssl.so %{_includedir}/xmlsec1/xmlsec/openssl/ %{_libdir}/pkgconfig/xmlsec1-openssl.pc -%package gcrypt-devel -Summary: GCrypt crypto plugin for XML Security Library -Group: Development/Libraries/C and C++ -Requires: %{libgcrypt} = %{version} -Requires: %{name}-devel = %{version} - -%description gcrypt-devel -Libraries, includes, etc. for developing XML Security applications with GCrypt. - %files gcrypt-devel %defattr(-,root,root,-) %{_libdir}/libxmlsec1-gcrypt.so %{_includedir}/xmlsec1/xmlsec/gcrypt/ %{_libdir}/pkgconfig/xmlsec1-gcrypt.pc -%package gnutls-devel -Summary: GNUTls crypto plugin for XML Security Library -Group: Development/Libraries/C and C++ -Requires: %{libgnutls} = %{version} -Requires: %{name}-devel = %{version} -Requires: %{name}-openssl-devel = %{version} -Requires: gnutls-devel >= 1.0.20 -Requires: libgcrypt-devel >= 1.2.0 - -%description gnutls-devel -Libraries, includes, etc. for developing XML Security applications with GNUTls. - %files gnutls-devel %defattr(-,root,root,-) %{_libdir}/libxmlsec1-gnutls.so %{_includedir}/xmlsec1/xmlsec/gnutls/ %{_libdir}/pkgconfig/xmlsec1-gnutls.pc -%package nss-devel -Summary: NSS crypto plugin for XML Security Library -Group: Development/Libraries/C and C++ -Requires: %{libnss} = %{version} -Requires: %{name}-devel = %{version} -Requires: mozilla-nspr-devel -Requires: mozilla-nss-devel >= 3.2 - -%description nss-devel -Libraries, includes, etc. for developing XML Security applications with NSS. - %files nss-devel %defattr(-,root,root,-) %{_libdir}/libxmlsec1-nss.so %{_includedir}/xmlsec1/xmlsec/nss/ %{_libdir}/pkgconfig/xmlsec1-nss.pc -%prep -%setup -q - -%build -%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 -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 - -%install -mkdir -p %{buildroot}%{_prefix}/bin -mkdir -p %{buildroot}%{_includedir}/xmlsec1 -mkdir -p %{buildroot}%{_libdir} -mkdir -p %{buildroot}%{_prefix}/man/man1 - -make DESTDIR=%{buildroot} install %{?_smp_mflags} -find %{buildroot} -type f -name "*.la" -delete -print - -# move installed docs to include them in -devel package via %%doc magic -rm -rf __tmp_doc ; mkdir __tmp_doc -mv %{buildroot}%{_datadir}/doc/xmlsec1/* __tmp_doc -rmdir %{buildroot}%{_datadir}/doc/xmlsec1 - %changelog