diff --git a/.gitignore b/.gitignore index 41cc71c..e8f33e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -xml-security-c-1.5.1.tar.gz -/xml-security-c-1.6.0.tar.gz -/xml-security-c-1.6.1.tar.gz +xml-security-c-*.tar.gz diff --git a/sources b/sources index 964d32d..45ff318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -808316c80a7453b6d50a0bceb7ebe9bc xml-security-c-1.6.1.tar.gz +SHA512 (xml-security-c-2.0.4.tar.gz) = c2a83b0415ec0a83c932bffb709beac5763e20397f3ec4dfb350a3190de878a860b75482c095b9ac1cae3bbfbcc968b2a26ea912816b0dd4456c7ea0e07f3060 diff --git a/xml-security-c.spec b/xml-security-c.spec index 31dd48e..650efee 100644 --- a/xml-security-c.spec +++ b/xml-security-c.spec @@ -1,16 +1,20 @@ -Name: xml-security-c -Version: 1.6.1 -Release: 8%{?dist} -Summary: C++ Implementation of W3C security standards for XML - -Group: System Environment/Libraries -License: ASL 2.0 -URL: http://santuario.apache.org/c/ -Source: http://www.apache.org/dist//santuario/c-library/xml-security-c-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: xerces-c-devel xalan-c-devel openssl-devel -BuildRequires: pkgconfig +Summary: C++ Implementation of W3C security standards for XML +Name: xml-security-c +Version: 2.0.4 +Release: 11%{?dist} +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 +URL: http://santuario.apache.org/cindex.html +Source0: https://www.apache.org/dist/santuario/c-library/%{name}-%{version}.tar.gz +BuildRequires: make +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: pkgconfig +BuildRequires: xalan-c-devel +BuildRequires: xerces-c-devel %description The xml-security-c library is a C++ implementation of the XML Digital Signature @@ -18,68 +22,180 @@ specification. The library makes use of the Apache XML project's Xerces-C XML Parser and Xalan-C XSLT processor. The latter is used for processing XPath and XSLT transforms. - -%package devel -Summary: Development files for xml-security-c -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: xerces-c-devel xalan-c-devel openssl-devel -# There are a number of headers that can use NSS if HAVE_NSS is set to 1 -# Current build does not set it (configure does not even check for NSS) -# so we do not include this dependency for now. -# Requires: nss-devel +%package devel +Summary: Development files for xml-security-c +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libstdc++-devel +Requires: openssl-devel +Requires: xalan-c-devel +Requires: xerces-c-devel %description devel This package provides development files for xml-security-c, a C++ library for XML Digital Signatures. - %prep -%setup -q -# Remove bogus "-O2" from CXXFLAGS to avoid overriding RPM_OPT_FLAGS. -sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure +%autosetup -p1 %build -%configure --disable-static -make %{?_smp_mflags} - -%check -# Verify that what was compiled actually works. -./xsec/xtest +autoreconf -fiv +%configure \ + --disable-debug \ + --disable-static \ + --without-nss \ + --with-openssl \ + --with-xalan \ + %{nil} +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT CPPROG="cp -p" - -# We do not ship .la files. -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la - -# Do not ship library test utilities. These are only needed for -# xml-security-c developers and they should have the whole source anyway. -rm -rf $RPM_BUILD_ROOT%{_bindir} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install +%check +./xsec/xsec-xtest %files -%defattr(-,root,root,-) -%{_libdir}/libxml-security-c.so.* - +%{_libdir}/libxml-security-c.so.20{,.*} %files devel -%defattr(-,root,root,-) +%license LICENSE.txt +%doc CHANGELOG.txt NOTICE.txt %{_includedir}/xsec %{_libdir}/libxml-security-c.so - -%doc CHANGELOG.txt LICENSE.txt NOTICE.txt +%{_libdir}/pkgconfig/xml-security-c.pc +%exclude %{_bindir}/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Fri Jun 12 2026 Yaakov Selkowitz - 2.0.4-10 +- Rebuilt for openssl 4.0 + +* Sat Jan 17 2026 Fedora Release Engineering - 2.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Oct 18 2024 Pete Walter - 2.0.4-6 +- Rebuild for xerces-c 3.3 + +* Wed Jul 24 2024 Miroslav Suchý - 2.0.4-5 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 26 2023 Yaakov Selkowitz - 2.0.4-1 +- Update to 2.0.4 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 2.0.2-10 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 2.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 7 18:18:40 EST 2020 Benjamin A. Beasley - 2.0.2-7 +- Work around removed XALAN_USING_XALAN compatibility macro in xalan-c 1.12 + +* Mon Dec 7 19:42:40 CET 2020 Zbigniew Jędrzejewski-Szmek - 2.0.2-6 +- Rebuilt for xalan-c 1.12.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Tomasz Kłoczko - 2.0.2-1 +- use %%exclude does not cause include those files into package %%files (revert last commit) +- format text to 80 col +- use https:// in Source0 url +- improved BuildRequires + +* Fri Nov 16 2018 Pete Walter - 2.0.2-1 +- Update to 2.0.2 +- Remove explicit attr modes + +* Wed Jul 18 2018 Tomasz Kłoczko - 1.7.3-5 +- added /usr/bin/c++ to BuildRequires + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Tomasz Kłoczko - 1.7.3-3 +- remove ldconfig scriptlets +- more cleanups + +* Wed Aug 30 2017 Tomasz Kłoczko - 1.7.3-2 +- added patch which allows build xml-security-c against openssl 1.1 +- added ac_fixes patch: do not use sed to remove hardcoded compile + options. Use patch because you will never know is such correction + still needed (added autoconf, automake and libtool to BuildRequires) +- added libstdc++-devel to BuildReqires and to devel Requires +- add explicit all %%configure options to prevent build by mistake package + against nss and force use openssl +- added --disable-debug to %%configure options +- added use %%autosetup in %%prep +- do not waste IOs on remove not packaged files and add them %%files + with %%exclude +- indent and clean spec (move patch comments to the patch) + +* Tue Aug 29 2017 Kalev Lember - 1.7.3-1 +- Update to 1.7.3 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Feb 02 2016 Jonathan Wakely - 1.6.1-11 +- Patched for C++11 compatibility + +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.6.1-9 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 1.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -130,7 +246,7 @@ rm -rf $RPM_BUILD_ROOT - New upstream release * Tue Apr 28 2009 Antti Andreimann - 1.4.0-2 -- Execute sed magic against configure instead of configure.ac to +- Execute sed magic against configure instead of configure.ac to avoid calling autotools - Removed build dependency on autotools. - Do not ship test binaries (not needed for end-users)