| |
@@ -1,20 +1,17 @@
|
| |
Name: zxing-cpp
|
| |
- Version: 2.0.0
|
| |
- Release: 6%{?dist}
|
| |
+ 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 @@
|
| |
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 @@
|
| |
# 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
|
| |
@@ -110,48 +114,4 @@
|
| |
%{_libdir}/zxingcpp%{python3_ext_suffix}
|
| |
|
| |
%changelog
|
| |
- * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
|
| |
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
| |
-
|
| |
- * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
|
| |
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
| |
-
|
| |
- * Sat Jul 01 2023 Python Maint <python-maint@redhat.com> - 2.0.0-4
|
| |
- - Rebuilt for Python 3.12
|
| |
-
|
| |
- * Wed Jun 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 2.0.0-3
|
| |
- - Rebuilt due to fmt 10 update.
|
| |
-
|
| |
- * Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.0.0-2
|
| |
- - Rebuilt for Python 3.12
|
| |
-
|
| |
- * Fri Feb 24 2023 Caolán McNamara <caolanm@redhat.com> 2.0.0-1
|
| |
- - latest release
|
| |
- - migrated to SPDX license
|
| |
-
|
| |
- * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
|
| |
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
| |
-
|
| |
- * Wed Oct 26 2022 Tom Stellard <tstellar@redhat.com> - 1.2.0-8
|
| |
- - Prevent stripping of python module
|
| |
-
|
| |
- * Tue Aug 02 2022 Caolán McNamara <caolanm@redhat.com> 1.2.0-7
|
| |
- - Resolves: rhbz#2113772 FTBFS in Fedora rawhide/f37
|
| |
-
|
| |
- * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6
|
| |
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
| |
-
|
| |
- * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.2.0-5
|
| |
- - Rebuilt for Python 3.11
|
| |
-
|
| |
- * Sat Apr 23 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.0-4
|
| |
- - Security fix for CVE-2022-28041
|
| |
-
|
| |
- * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
|
| |
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
| |
-
|
| |
- * Tue Dec 14 2021 Caolán McNamara <caolanm@redhat.com> 1.2.0-2
|
| |
- - build python bindings
|
| |
-
|
| |
- * Fri Dec 10 2021 Caolán McNamara <caolanm@redhat.com> 1.2.0-1
|
| |
- - initial import
|
| |
+ %autochangelog
|
| |
topazus
commented 10 months ago
Minor improvements:
remove zxing-cpp-1.2.0-system-pybind11.patch file, set
BUILD_DEPENDENCIEStoLOCALto use system dependenciesconvert to %autorelease and %autochangelog