From c5193f79762184dd010503b54a4f4bd1551028a3 Mon Sep 17 00:00:00 2001
From: topazus <topazus@outlook.com>
Date: Sun, 3 Mar 2024 20:23:05 +0800
Subject: [PATCH] update to 2.2.1

---
 .gitignore     |  1 +
 sources        |  2 +-
 zxing-cpp.spec | 16 ++++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

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.spec b/zxing-cpp.spec
index 8993d00..e1aee24 100644
--- a/zxing-cpp.spec
+++ b/zxing-cpp.spec
@@ -1,20 +1,17 @@
 Name: zxing-cpp
-Version: 2.0.0
+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
+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
 
 %description
 ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode
@@ -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 -r -i 's@pybind11\[global\]@pybind11@' wrappers/python/pyproject.toml
 # build verbosely:
 
 %generate_buildrequires
@@ -62,7 +61,12 @@ 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 \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_PYTHON_MODULE=ON \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DBUILD_DEPENDENCIES=LOCAL \
+
 %cmake_build
 pushd wrappers/python
 # CMake respects this environment variable. We need to see the compiler