From a5f5259d33009ae15b80a71f8e8ecd875b26d48a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 22:15:32 +0200 Subject: [PATCH 01/12] Rebuilt for Python 3.12 --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 8757f65..1cda22e 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Tue Jun 13 2023 Python Maint - 2.0.0-2 +- Rebuilt for Python 3.12 + * Fri Feb 24 2023 Caolán McNamara 2.0.0-1 - latest release - migrated to SPDX license From 0e9e8b06b2eac657fc45cce6229d9613a142a753 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 11:21:45 +0200 Subject: [PATCH 02/12] Rebuilt due to fmt 10 update. --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 1cda22e..8762337 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Wed Jun 28 2023 Vitaly Zaitsev - 2.0.0-3 +- Rebuilt due to fmt 10 update. + * Tue Jun 13 2023 Python Maint - 2.0.0-2 - Rebuilt for Python 3.12 From 613e9b95cbf6cd42200f3f74cb47f130c3c7dac6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 1 Jul 2023 11:45:41 +0200 Subject: [PATCH 03/12] Rebuilt for Python 3.12 --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 8762337..4cc4e53 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Sat Jul 01 2023 Python Maint - 2.0.0-4 +- Rebuilt for Python 3.12 + * Wed Jun 28 2023 Vitaly Zaitsev - 2.0.0-3 - Rebuilt due to fmt 10 update. From 23be1c2ec4d4858a6bf598ccc722728ff802318b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:48:53 +0000 Subject: [PATCH 04/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 4cc4e53..97c8bab 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 01 2023 Python Maint - 2.0.0-4 - Rebuilt for Python 3.12 From 8e28d49bf4261f7adbc5ea89de57ffc9125ce60f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:20:24 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 97c8bab..4493c25 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 25adcbcda415630dca143b34cae9125d08935aa0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 08:11:56 +0200 Subject: [PATCH 06/12] Rebuilt for Python 3.13 --- zxing-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 4493c25..7e4414f 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,6 +110,9 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog +* Sat Jun 08 2024 Python Maint - 2.0.0-7 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 2.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8bb7a3aef09044ca6945af8f08e7cc507c2a7025 Mon Sep 17 00:00:00 2001 From: topazus Date: Sat, 22 Jun 2024 22:13:58 +0800 Subject: [PATCH 07/12] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 48 +++++++++++++++++++++++++++++++++++++++++++++++ zxing-cpp.spec | 51 ++------------------------------------------------ 2 files changed, 50 insertions(+), 49 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..6512a05 --- /dev/null +++ b/changelog @@ -0,0 +1,48 @@ +* Sat Jun 08 2024 Python Maint - 2.0.0-7 +- Rebuilt for Python 3.13 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jul 01 2023 Python Maint - 2.0.0-4 +- Rebuilt for Python 3.12 + +* Wed Jun 28 2023 Vitaly Zaitsev - 2.0.0-3 +- Rebuilt due to fmt 10 update. + +* Tue Jun 13 2023 Python Maint - 2.0.0-2 +- Rebuilt for Python 3.12 + +* Fri Feb 24 2023 Caolán McNamara 2.0.0-1 +- latest release +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Oct 26 2022 Tom Stellard - 1.2.0-8 +- Prevent stripping of python module + +* Tue Aug 02 2022 Caolán McNamara 1.2.0-7 +- Resolves: rhbz#2113772 FTBFS in Fedora rawhide/f37 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.2.0-5 +- Rebuilt for Python 3.11 + +* Sat Apr 23 2022 Benjamin A. Beasley - 1.2.0-4 +- Security fix for CVE-2022-28041 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Caolán McNamara 1.2.0-2 +- build python bindings + +* Fri Dec 10 2021 Caolán McNamara 1.2.0-1 +- initial import diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 7e4414f..8993d00 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,6 +1,6 @@ Name: zxing-cpp Version: 2.0.0 -Release: 7%{?dist} +Release: %autorelease Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: @@ -110,51 +110,4 @@ popd %{_libdir}/zxingcpp%{python3_ext_suffix} %changelog -* Sat Jun 08 2024 Python Maint - 2.0.0-7 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering - 2.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 01 2023 Python Maint - 2.0.0-4 -- Rebuilt for Python 3.12 - -* Wed Jun 28 2023 Vitaly Zaitsev - 2.0.0-3 -- Rebuilt due to fmt 10 update. - -* Tue Jun 13 2023 Python Maint - 2.0.0-2 -- Rebuilt for Python 3.12 - -* Fri Feb 24 2023 Caolán McNamara 2.0.0-1 -- latest release -- migrated to SPDX license - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Oct 26 2022 Tom Stellard - 1.2.0-8 -- Prevent stripping of python module - -* Tue Aug 02 2022 Caolán McNamara 1.2.0-7 -- Resolves: rhbz#2113772 FTBFS in Fedora rawhide/f37 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.2.0-5 -- Rebuilt for Python 3.11 - -* Sat Apr 23 2022 Benjamin A. Beasley - 1.2.0-4 -- Security fix for CVE-2022-28041 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Dec 14 2021 Caolán McNamara 1.2.0-2 -- build python bindings - -* Fri Dec 10 2021 Caolán McNamara 1.2.0-1 -- initial import +%autochangelog From 232a5156f86cd52a63ed267ba320d3dc196b5832 Mon Sep 17 00:00:00 2001 From: topazus Date: Sat, 22 Jun 2024 22:20:48 +0800 Subject: [PATCH 08/12] update to 2.2.1 --- .gitignore | 1 + sources | 2 +- zxing-cpp-1.2.0-system-pybind11.patch | 37 -------------------- zxing-cpp.spec | 49 ++++++++++++++------------- 4 files changed, 28 insertions(+), 61 deletions(-) delete mode 100644 zxing-cpp-1.2.0-system-pybind11.patch diff --git a/.gitignore b/.gitignore index 90a49bc..4bff504 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zxing-cpp-2.0.0.tar.gz +/zxing-cpp-2.2.1.tar.gz diff --git a/sources b/sources index 2ce0201..be224d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zxing-cpp-2.0.0.tar.gz) = fa22164f834a42194eafd0d3e9c09d953233c69843ac6e79c8d6513314be28d8082382b436c379368e687e0eed05cb5e566d2893ec6eb29233a36643904ae083 +SHA512 (zxing-cpp-2.2.1.tar.gz) = f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53 diff --git a/zxing-cpp-1.2.0-system-pybind11.patch b/zxing-cpp-1.2.0-system-pybind11.patch deleted file mode 100644 index dfea017..0000000 --- a/zxing-cpp-1.2.0-system-pybind11.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur zxing-cpp-1.2.0-original/wrappers/python/CMakeLists.txt zxing-cpp-1.2.0/wrappers/python/CMakeLists.txt ---- zxing-cpp-1.2.0-original/wrappers/python/CMakeLists.txt 2021-05-28 06:47:09.000000000 -0400 -+++ zxing-cpp-1.2.0/wrappers/python/CMakeLists.txt 2021-12-13 20:31:22.286170793 -0500 -@@ -1,8 +1,7 @@ - cmake_minimum_required(VERSION 3.14) - project(ZXingPython) - --set (pybind11_git_repo https://github.com/pybind/pybind11.git) --set (pybind11_git_rev v2.10.2) -+find_package(pybind11) - - # check if we are called from the top-level ZXing project - get_directory_property(hasParent PARENT_DIRECTORY) -@@ -21,14 +20,8 @@ - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../core ZXing EXCLUDE_FROM_ALL) - - include(${CMAKE_CURRENT_SOURCE_DIR}/../../zxing.cmake) -- zxing_add_package(pybind11 pybind11 ${pybind11_git_repo} ${pybind11_git_rev}) - else() - # we don't have access to the top-level cmake helpers -> simply fetch it unconditional -- include(FetchContent) -- FetchContent_Declare (pybind11 -- GIT_REPOSITORY ${pybind11_git_repo} -- GIT_TAG ${pybind11_git_rev}) -- FetchContent_MakeAvailable (pybind11) - - # Building from python source distribution (which does not include the whole repository but only python part) - # so we need to get c++ source git to build the python extension. The python distribution version (given in -@@ -54,8 +47,6 @@ - add_subdirectory(${zxing-cpp_SOURCE_DIR}/core ZXing EXCLUDE_FROM_ALL) - endif() - endif() --else() -- zxing_add_package(pybind11 pybind11 ${pybind11_git_repo} ${pybind11_git_rev}) - endif() - - # build the python module diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 8993d00..e08e8d4 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,41 +1,38 @@ -Name: zxing-cpp -Version: 2.0.0 -Release: %autorelease -Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library +Name: zxing-cpp +Version: 2.2.1 +Release: %autorelease +Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library # The entire source is ASL 2.0, except: # - wrappers/wasm/base64ArrayBuffer.js is MIT (but is not used) -License: Apache-2.0 AND MIT -Url: https://github.com/nu-book/zxing-cpp -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +License: Apache-2.0 AND MIT +URL: https://github.com/zxing-cpp/zxing-cpp +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: cmake(fmt) -# Use the system copy of pybind11 rather than trying to download a copy. This -# patch is unconditional, so it is not, as-is, suitable for sending upstream. -Patch0: zxing-cpp-1.2.0-system-pybind11.patch +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: cmake(fmt) %description ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library implemented in C++. -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel +%description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package -n python3-%{name} +%package -n python3-%{name} Summary: Python bindings for the %{name} barcode library -BuildRequires: python3-devel -BuildRequires: pybind11-devel -BuildRequires: chrpath +BuildRequires: python3-devel +BuildRequires: pybind11-devel +BuildRequires: chrpath -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-%{name} %{summary}. @@ -47,6 +44,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} sed -r -i 's@(COMMAND )python@\1%{python3}@' wrappers/python/CMakeLists.txt # we don’t need cmake as a python dependency sed -r -i '/cmake/d' wrappers/python/pyproject.toml + +sed -i 's/pybind11\[global\]/pybind11/' wrappers/python/pyproject.toml # build verbosely: %generate_buildrequires @@ -62,7 +61,11 @@ popd &>/dev/null # CMAKE_BUILD_TYPE=RelWithDebInfo prevents the build from stripping the # python module after it is built. The stripping happens in # pybind11_add_module. -%cmake -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON_MODULE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo +%cmake \ + -DZXING_DEPENDENCIES=LOCAL \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PYTHON_MODULE=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_build pushd wrappers/python # CMake respects this environment variable. We need to see the compiler From fc8305b0bbb2a74d0f5ccc7fd233b35daafb5762 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:00 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1408342a1512daedb14b22a991e6ab92b3285780 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:54:42 +0000 Subject: [PATCH 10/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 23c7a4eebb9fee77ce7006b637e843593864dc37 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 21:24:32 +0200 Subject: [PATCH 11/12] Rebuilt for Python 3.14 From 5b15ae3c7803438e86e7f2b9a3af719f12db0170 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:21:58 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild