rpm/zxing-cpp
SHA256
1
0
Fork 0
forked from pool/zxing-cpp
Code Pull Requests Activity

Accepting request 929043 from home:dspinella:branches:devel:libraries:c_c++

Browse Source 
- Use the updated cmake3-full package instead of cmake on SLE12
- Do not build examples on SLE12
- Only build blackbox tests on TW

OBS-URL: https://build.opensuse.org/request/show/929043
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=20
This commit is contained in:
Jan Engelhardt 2021-11-04 09:54:43 +00:00 committed by Git OBS Bridge
parent c18fa5efaa
commit 9744d0b921
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zxing-cpp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 3 14:42:33 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Use the updated cmake3-full package instead of cmake on SLE12
- Do not build examples on SLE12
- Only build blackbox tests on TW
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 29 10:37:28 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de> Sat May 29 10:37:28 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>

24
zxing-cpp.spec
View File

@ -28,14 +28,23 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE cmake-check-system-first.patch -- Search system for needed libraries first # PATCH-FIX-OPENSUSE cmake-check-system-first.patch -- Search system for needed libraries first
Patch0: cmake-check-system-first.patch Patch0: cmake-check-system-first.patch
BuildRequires: pkgconfig
# Use cmake3 package on SLE12 because cmake is too old (version 3.5)
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
BuildRequires: cmake3-full >= 3.10
BuildRequires: gcc11-c++
%else
BuildRequires: cmake >= 3.10 BuildRequires: cmake >= 3.10
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig
# For tests using the example app # For tests using the example app
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Multimedia)
%endif
# only TW has fmt
%if 0%{?suse_version} > 1500
# For blackbox tests # For blackbox tests
BuildRequires: cmake(fmt) >= 7.1.2 BuildRequires: cmake(fmt) >= 7.1.2
%endif
%description %description
ZXing ("zebra crossing") is an multi-format 1D/2D barcode image ZXing ("zebra crossing") is an multi-format 1D/2D barcode image
@ -66,7 +75,18 @@ other applications.
%autosetup -p1 %autosetup -p1
%build %build
%cmake # Use g++-11 to build a C++17 codebase
# Examples require QT5
# Blackbox tests require fmt
%cmake \
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
-DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \
-DBUILD_EXAMPLES=OFF \
%endif
%if 0%{?suse_version} < 1550
-DBUILD_BLACKBOX_TESTS=OFF \
%endif
;
%cmake_build %cmake_build
%install %install