The package rpms/libdigidocpp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libdigidocpp.git/commit/?id=f3947b15....
Change: +ExcludeArch: %{ix86}
Thanks.
Full change: ============
commit e0ebd85064aaf1293b6290acafa85405f4e4efee Author: Germano Massullo germano.massullo@gmail.com Date: Wed Jun 19 13:26:18 2024 +0200
3.17.1 release
diff --git a/.gitignore b/.gitignore index abc46c4..5b74722 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /libdigidocpp-3.15.0.tar.gz /libdigidocpp-3.16.0.tar.gz /libdigidocpp-3.17.0.tar.gz +/libdigidocpp-3.17.1.tar.gz diff --git a/Add-zlib-header.patch b/Add-zlib-header.patch deleted file mode 100644 index b87e954..0000000 --- a/Add-zlib-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/util/ZipSerialize.cpp b/src/util/ZipSerialize.cpp -index 87bf9db..fa79b52 100644 ---- a/src/util/ZipSerialize.cpp -+++ b/src/util/ZipSerialize.cpp -@@ -23,6 +23,7 @@ - #include "File.h" - #include "log.h" - -+#include <zlib.h> - #include <minizip/unzip.h> - #include <minizip/zip.h> - #ifdef _WIN32 diff --git a/Increase_version_control.patch b/Increase_version_control.patch deleted file mode 100644 index 6671291..0000000 --- a/Increase_version_control.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a519f67..f7343eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,7 @@ find_package(ZLIB REQUIRED) - find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19 - if(UNIX AND NOT APPLE) - find_package(PkgConfig) -- pkg_check_modules(MINIZIP minizip IMPORTED_TARGET minizip<2.0.0) -+ pkg_check_modules(MINIZIP minizip IMPORTED_TARGET) - endif() - find_package(SWIG) - find_package(JNI) diff --git a/libdigidocpp.spec b/libdigidocpp.spec index 68e0f41..3716f7e 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,6 +1,6 @@ Name: libdigidocpp
-Version: 3.17.0 +Version: 3.17.1 Release: 1%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents @@ -12,11 +12,7 @@ Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz ExcludeArch: %{ix86}
BuildRequires: make -%if 0%{?el7} -BuildRequires: cmake3 -%else BuildRequires: cmake -%endif BuildRequires: gcc-c++ BuildRequires: pkgconfig(openssl) BuildRequires: xml-security-c-devel @@ -29,8 +25,7 @@ BuildRequires: vim-common # Dynamically loaded libraries Requires: opensc%{?_isa}
-Patch0: Increase_version_control.patch -Patch1: Add-zlib-header.patch +Patch0: minizip.patch
%description Libdigidocpp library offers creating, signing and verification of digitally @@ -103,7 +98,7 @@ rm -rf src/minizip %endif
%files -%doc AUTHORS README.md CONTRIBUTING.md RELEASE-NOTES.md +%doc AUTHORS README.md RELEASE-NOTES.md %license COPYING LICENSE.LGPL %{_libdir}/*.so.* %dir %{_sysconfdir}/digidocpp @@ -113,19 +108,24 @@ rm -rf src/minizip %{_mandir}/man1/digidoc-tool.1.*
%files devel -%doc AUTHORS README.md CONTRIBUTING.md RELEASE-NOTES.md +%doc AUTHORS README.md RELEASE-NOTES.md %license COPYING %{_includedir}/digidocpp/ %{_libdir}/pkgconfig/lib*.pc %{_libdir}/*.so
%files doc -%doc AUTHORS README.md CONTRIBUTING.md RELEASE-NOTES.md doc/* +%doc AUTHORS README.md RELEASE-NOTES.md doc/* %license COPYING %{_docdir}/libdigidocpp/*
%changelog +* Tue Jun 18 2024 Germano Massullo germano.massullo@gmail.com - 3.17.1-1 +- 3.17.1 release +- Replaced Add-zlib-header.patch and Increase_version_control.patch with minizip.patch +- Removed CONTRIBUTING.md in the spec file + * Thu Apr 18 2024 Dmitri Smirnov dmitri@smirnov.ee - 3.17.0-1 - 3.17.0 release
diff --git a/minizip.patch b/minizip.patch new file mode 100644 index 0000000..bbc5a62 --- /dev/null +++ b/minizip.patch @@ -0,0 +1,23 @@ +diff -urNr libdigidocpp-3.17.1-orig/CMakeLists.txt libdigidocpp-3.17.1/CMakeLists.txt +--- libdigidocpp-3.17.1-orig/CMakeLists.txt 2024-04-19 07:38:23.000000000 +0200 ++++ libdigidocpp-3.17.1/CMakeLists.txt 2024-06-19 13:12:31.263688389 +0200 +@@ -48,7 +48,7 @@ + find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19 + if(UNIX AND NOT APPLE) + find_package(PkgConfig) +- pkg_check_modules(MINIZIP minizip IMPORTED_TARGET minizip<2.0.0) ++ pkg_check_modules(MINIZIP minizip IMPORTED_TARGET) + endif() + find_package(SWIG) + find_package(JNI) +diff -urNr libdigidocpp-3.17.1-orig/src/util/ZipSerialize.cpp libdigidocpp-3.17.1/src/util/ZipSerialize.cpp +--- libdigidocpp-3.17.1-orig/src/util/ZipSerialize.cpp 2024-04-19 07:38:23.000000000 +0200 ++++ libdigidocpp-3.17.1/src/util/ZipSerialize.cpp 2024-06-19 13:11:53.726597554 +0200 +@@ -22,6 +22,7 @@ + #include "DateTime.h" + #include "log.h" + ++#include <zlib.h> + #include <minizip/unzip.h> + #include <minizip/zip.h> + #ifdef _WIN32 diff --git a/sources b/sources index beefa95..c9dfef2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdigidocpp-3.17.0.tar.gz) = f8da1d2aa667806ead1ae589e963fa94fe25c8b2d6f4c0f1d70f77f6a2832d93afe30ee0824094c206a658380a2f71c70cbc49f20f3480b2af8d9015daaabe4e +SHA512 (libdigidocpp-3.17.1.tar.gz) = a11022a208a261ff2372e626bfb87a07cdb7091b3173133215d8b2f743b9517765c003451c1f9002081a2c1271dd83b0d3ce7ea1a5538441648dc11ba841c0a9
commit d4bb01753079fa3a2cfe2dae9575dfdb758beeb8 Author: Dmitri Smirnov dmitri@smirnov.ee Date: Thu Apr 18 12:35:50 2024 +0200
3.17.0 release
diff --git a/.gitignore b/.gitignore index 7fcca56..abc46c4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /libdigidocpp-3.14.12.tar.gz /libdigidocpp-3.15.0.tar.gz /libdigidocpp-3.16.0.tar.gz +/libdigidocpp-3.17.0.tar.gz diff --git a/libdigidocpp.spec b/libdigidocpp.spec index a510cdd..68e0f41 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,7 +1,7 @@ Name: libdigidocpp
-Version: 3.16.0 -Release: 7%{?dist} +Version: 3.17.0 +Release: 1%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ @@ -126,6 +126,9 @@ rm -rf src/minizip
%changelog +* Thu Apr 18 2024 Dmitri Smirnov dmitri@smirnov.ee - 3.17.0-1 +- 3.17.0 release + * Tue Feb 13 2024 Benjamin A. Beasley code@musicinmybrain.net - 3.16.0-7 - Drop i686 support (leaf package)
diff --git a/sources b/sources index 96a7f4e..beefa95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdigidocpp-3.16.0.tar.gz) = 9dd785456aa0d45a3296dd02b2d4d7578f0a0312cccb09eeae70a0b65a9b7068ebd06bac6bbed1ffa0aa84c0e3002fd8d450428488093462551163895938e46b +SHA512 (libdigidocpp-3.17.0.tar.gz) = f8da1d2aa667806ead1ae589e963fa94fe25c8b2d6f4c0f1d70f77f6a2832d93afe30ee0824094c206a658380a2f71c70cbc49f20f3480b2af8d9015daaabe4e
commit f3947b1527bc1fda714a56e1ede8dce3160fb703 Author: Benjamin A. Beasley code@musicinmybrain.net Date: Tue Feb 13 15:31:47 2024 -0500
Drop i686 support (leaf package)
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
diff --git a/libdigidocpp.spec b/libdigidocpp.spec index 0d128d6..a510cdd 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,13 +1,15 @@ Name: libdigidocpp
Version: 3.16.0 -Release: 6%{?dist} +Release: 7%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ URL: https://github.com/open-eid/libdigidocpp Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86}
BuildRequires: make %if 0%{?el7} @@ -124,6 +126,9 @@ rm -rf src/minizip
%changelog +* Tue Feb 13 2024 Benjamin A. Beasley code@musicinmybrain.net - 3.16.0-7 +- Drop i686 support (leaf package) + * Mon Jan 29 2024 Lukas Javorsky ljavorsk@redhat.com - 3.16.0-6 - Build with system minizip-ng-compat - Add missing zlib.h include in ZipSerialize.cpp
commit f1fa4ac7d8de8dbec305caf5a4e46851ffec8eb3 Author: Lukas Javorsky ljavorsk@redhat.com Date: Mon Jan 29 09:10:46 2024 +0000
Build with system minizip-ng-compat
Add missing zlib.h include in ZipSerialize.cpp Increase version control of minzip (so minizip-ng can be used)
diff --git a/Add-zlib-header.patch b/Add-zlib-header.patch new file mode 100644 index 0000000..b87e954 --- /dev/null +++ b/Add-zlib-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/util/ZipSerialize.cpp b/src/util/ZipSerialize.cpp +index 87bf9db..fa79b52 100644 +--- a/src/util/ZipSerialize.cpp ++++ b/src/util/ZipSerialize.cpp +@@ -23,6 +23,7 @@ + #include "File.h" + #include "log.h" + ++#include <zlib.h> + #include <minizip/unzip.h> + #include <minizip/zip.h> + #ifdef _WIN32 diff --git a/Increase_version_control.patch b/Increase_version_control.patch new file mode 100644 index 0000000..6671291 --- /dev/null +++ b/Increase_version_control.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a519f67..f7343eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ find_package(ZLIB REQUIRED) + find_package(MiniZip 1 QUIET) # version range (0...<2.0.0) requires CMake>=3.19 + if(UNIX AND NOT APPLE) + find_package(PkgConfig) +- pkg_check_modules(MINIZIP minizip IMPORTED_TARGET minizip<2.0.0) ++ pkg_check_modules(MINIZIP minizip IMPORTED_TARGET) + endif() + find_package(SWIG) + find_package(JNI) diff --git a/libdigidocpp.spec b/libdigidocpp.spec index a7d45d6..0d128d6 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,7 +1,7 @@ Name: libdigidocpp
Version: 3.16.0 -Release: 5%{?dist} +Release: 6%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ @@ -20,14 +20,15 @@ BuildRequires: pkgconfig(openssl) BuildRequires: xml-security-c-devel BuildRequires: xsd BuildRequires: zlib-devel +BuildRequires: minizip-ng-compat-devel # Provide xxd BuildRequires: vim-common
# Dynamically loaded libraries Requires: opensc%{?_isa}
-Provides: bundled(minizip) - +Patch0: Increase_version_control.patch +Patch1: Add-zlib-header.patch
%description Libdigidocpp library offers creating, signing and verification of digitally @@ -51,7 +52,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-doc package contains documentation provided by upstream.
%prep -%setup -q +%autosetup -p 1 # Compatibility macro XALAN_USING_XALAN() was removed in xalan-c 1.12. This # workaround is harmless when using older xalan-c versions. See # https://github.com/open-eid/libdigidocpp/issues/363 and the corresponding @@ -63,6 +64,9 @@ find . -type f -execdir sed -r -i \ # unpackaging and fixing the encoding rm -rf doc/sample_files.zip
+# Remove bundled minizip +rm -rf src/minizip + %build # the dot after %%{cmake} has been removed from Fedora because of # https://bugzilla.redhat.com/show_bug.cgi?id=2059201 @@ -120,6 +124,11 @@ rm -rf doc/sample_files.zip
%changelog +* Mon Jan 29 2024 Lukas Javorsky ljavorsk@redhat.com - 3.16.0-6 +- Build with system minizip-ng-compat +- Add missing zlib.h include in ZipSerialize.cpp +- Increase version control of minzip (so minizip-ng can be used) + * Thu Jan 25 2024 Fedora Release Engineering releng@fedoraproject.org - 3.16.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit 7d081118f114bddde182abd2a8138326662cdd3c Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jan 25 01:51:28 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/libdigidocpp.spec b/libdigidocpp.spec index 6919b95..a7d45d6 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,7 +1,7 @@ Name: libdigidocpp
Version: 3.16.0 -Release: 4%{?dist} +Release: 5%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ @@ -120,6 +120,9 @@ rm -rf doc/sample_files.zip
%changelog +* Thu Jan 25 2024 Fedora Release Engineering releng@fedoraproject.org - 3.16.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering releng@fedoraproject.org - 3.16.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit acfecc87311858b5218fc357e5457a9198c2cf11 Author: Fedora Release Engineering releng@fedoraproject.org Date: Sun Jan 21 03:53:14 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/libdigidocpp.spec b/libdigidocpp.spec index 10b8bc9..6919b95 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,7 +1,7 @@ Name: libdigidocpp
Version: 3.16.0 -Release: 3%{?dist} +Release: 4%{?dist}
Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ @@ -120,6 +120,9 @@ rm -rf doc/sample_files.zip
%changelog +* Sun Jan 21 2024 Fedora Release Engineering releng@fedoraproject.org - 3.16.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Germano Massullo germano.massullo@gmail.com - 3.16.0-3 - adds BuildRequires: zlib-devel and Provides: bundled(minizip)
arch-excludes@lists.fedoraproject.org