|
|
|
|
@ -1,26 +1,54 @@
|
|
|
|
|
Name: zxing-cpp
|
|
|
|
|
Version: 2.0.0
|
|
|
|
|
Release: 6%{?dist}
|
|
|
|
|
Version: 1.2.0
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library
|
|
|
|
|
|
|
|
|
|
# The entire source is ASL 2.0, except:
|
|
|
|
|
#
|
|
|
|
|
# - TextCodec files, that is, core/src/textcodec/*, are
|
|
|
|
|
# (LGPLv2 with exceptions or LGPLv3 with exceptions).
|
|
|
|
|
# - core/src/textcodec/JPText{En,De}coder.* are, formally,
|
|
|
|
|
# ((LGPLv2 with exceptions or LGPLv3 with exceptions) and BSD),
|
|
|
|
|
# which still forms an effective license of
|
|
|
|
|
# (LGPLv2 with exceptions or LGPLv3 with exceptions)
|
|
|
|
|
# - wrappers/wasm/base64ArrayBuffer.js is MIT (but is not used)
|
|
|
|
|
License: Apache-2.0 AND MIT
|
|
|
|
|
# - thirdparty/stb/stb_image.h and thirdparty/stb/stb_image_write.h are MIT
|
|
|
|
|
# (but are unbundled)
|
|
|
|
|
#
|
|
|
|
|
# The resulting effective license for the combined library is:
|
|
|
|
|
License: LGPLv2 with exceptions or LGPLv3 with exceptions
|
|
|
|
|
Url: https://github.com/nu-book/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
|
|
|
|
|
# -static BR’s required by guidelines for tracking of header-only libraries:
|
|
|
|
|
BuildRequires: stb_image-devel
|
|
|
|
|
BuildRequires: stb_image-static
|
|
|
|
|
BuildRequires: stb_image_write-devel
|
|
|
|
|
BuildRequires: stb_image_write-static
|
|
|
|
|
# https://github.com/nu-book/zxing-cpp/issues/248
|
|
|
|
|
Patch0: 0001-Add-a-mode-to-build-against-system-versions-of-depen.patch
|
|
|
|
|
# Update stb_image/stb_image_write
|
|
|
|
|
# https://github.com/nu-book/zxing-cpp/pull/269
|
|
|
|
|
# Fixes CVE-2021-28021, CVE-2021-42715, and CVE-2021-42716, and adds a patch
|
|
|
|
|
# file for zxing-cpp-specific changes
|
|
|
|
|
Patch1: %{url}/pull/269.patch
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode
|
|
|
|
|
image processing library implemented in C++.
|
|
|
|
|
|
|
|
|
|
%package devel
|
|
|
|
|
# The entire contents are ASL 2.0, except:
|
|
|
|
|
#
|
|
|
|
|
# - %%{_includedir}/ZXing/textcodec/*.h are exactly or effectively
|
|
|
|
|
# (LGPLv2 with exceptions or LGPLv3 with exceptions)
|
|
|
|
|
#
|
|
|
|
|
# See licensing breakdown above base package’s License field for further
|
|
|
|
|
# details.
|
|
|
|
|
License: ASL 2.0 and (LGPLv2 with exceptions or LGPLv3 with exceptions)
|
|
|
|
|
Summary: Development files for %{name}
|
|
|
|
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
@ -28,75 +56,30 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
|
|
The %{name}-devel package contains libraries and header files for
|
|
|
|
|
developing applications that use %{name}.
|
|
|
|
|
|
|
|
|
|
%package -n python3-%{name}
|
|
|
|
|
Summary: Python bindings for the %{name} barcode library
|
|
|
|
|
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
BuildRequires: pybind11-devel
|
|
|
|
|
BuildRequires: chrpath
|
|
|
|
|
|
|
|
|
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description -n python3-%{name}
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%autosetup -p1
|
|
|
|
|
|
|
|
|
|
# don’t use unversioned “python” interpreter in tests
|
|
|
|
|
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
|
|
|
|
|
# build verbosely:
|
|
|
|
|
|
|
|
|
|
%generate_buildrequires
|
|
|
|
|
pushd wrappers/python &>/dev/null
|
|
|
|
|
%pyproject_buildrequires -r
|
|
|
|
|
popd &>/dev/null
|
|
|
|
|
# remove bundled stb libraries:
|
|
|
|
|
rm -v thirdparty/stb/stb_image_write.h thirdparty/stb/stb_image.h
|
|
|
|
|
# stb_image.h is trivially forked: reconstruct the changes with the latest
|
|
|
|
|
# unbundled copy
|
|
|
|
|
cp -p %{_includedir}/stb/stb_image.h thirdparty/stb/
|
|
|
|
|
pushd thirdparty/stb
|
|
|
|
|
patch -p1 < stb_image.patch
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
# Setting BUILD_PYTHON_MODULE builds a Python extension shared library module,
|
|
|
|
|
# but we don’t get any metadata (dist-info), so it’s not terribly useful for
|
|
|
|
|
# packaging purposes. Instead, it seems we must re-build the whole library
|
|
|
|
|
# through setuptools to get that.
|
|
|
|
|
# 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
|
|
|
|
|
%cmake_build
|
|
|
|
|
pushd wrappers/python
|
|
|
|
|
# CMake respects this environment variable. We need to see the compiler
|
|
|
|
|
# invocations to verify the distro build flags are respected. Unfortunately,
|
|
|
|
|
# pybind11 does add -O3, and there doesn’t seem to be a way to turn that off.
|
|
|
|
|
# It’s a global pybind11 decision, not something in this package’s sources.
|
|
|
|
|
export VERBOSE=1
|
|
|
|
|
%pyproject_wheel
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%cmake_install
|
|
|
|
|
pushd wrappers/python
|
|
|
|
|
%pyproject_install
|
|
|
|
|
# Now we do something sneaky: we substitute the Python extension that was built
|
|
|
|
|
# in the original CMake invocation, replacing the one built with setuptools. It
|
|
|
|
|
# is dynamically linked against the main libZXing.so, which makes it smaller,
|
|
|
|
|
# and it was not built with that pesky -O3 that was added by pybind11, so it
|
|
|
|
|
# better complies with packaging guidelines. The only problem is it contains an
|
|
|
|
|
# rpath that we need to remove.
|
|
|
|
|
popd
|
|
|
|
|
install -t '%{buildroot}%{python3_sitearch}' -p \
|
|
|
|
|
%{_vpath_builddir}/wrappers/python/zxingcpp.*.so
|
|
|
|
|
chrpath --delete %{buildroot}%{python3_sitearch}/zxingcpp.*.so
|
|
|
|
|
pushd wrappers/python
|
|
|
|
|
%pyproject_save_files zxingcpp
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
%ctest
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%{_libdir}/libZXing.so.3
|
|
|
|
|
%license LICENSE LICENSE.ZXing LICENSE.Qt LGPL_EXCEPTION.Qt NOTICE
|
|
|
|
|
%{_libdir}/libZXing.so.1
|
|
|
|
|
%{_libdir}/libZXing.so.%{version}
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
@ -106,52 +89,6 @@ popd
|
|
|
|
|
%{_libdir}/cmake/ZXing/
|
|
|
|
|
%{_libdir}/pkgconfig/zxing.pc
|
|
|
|
|
|
|
|
|
|
%files -n python3-%{name} -f %{pyproject_files}
|
|
|
|
|
%{_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
|
|
|
|
|
|
Caolán McNamara