Accepting request 865510 from home:alois:branches:Application:Geo

- Apply patch0 unconditionally and fix build on Leap

OBS-URL: https://build.opensuse.org/request/show/865510
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=47

zbar.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 21 21:02:59 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
+
+- Apply patch0 unconditionally and fix build on Leap
+
 -------------------------------------------------------------------
 Wed Nov 18 02:54:31 UTC 2020 - Wang Jun <jgwang@suse.com>
 

zbar.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zbar
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 # Copyright (c) 2010 Carlos Goncalves <cgoncalves@opensuse.org>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -47,11 +47,6 @@ BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xv)
-# autoconf/automake required due to patched configure.ac (Patch0)
-%if 0%{?suse_version} >= 1550
-BuildRequires:  autoconf
-BuildRequires:  automake >= 1.16
-%endif
 %if 0%{?suse_version} < 1500
 BuildRequires:  gcc7
 %endif
@@ -106,11 +101,7 @@ configuration files and development tools needed to compile and link
 applications using the zbar-qt library.
 
 %prep
-%setup -q
+%autosetup -p1
-%if 0%{?suse_version} >= 1550
-%patch0 -p1
-%endif
-%patch1 -p1
 
 %build
 test -x "$(type -p gcc)" && export CC=$_
@@ -122,7 +113,7 @@ test -x "$(type -p gcc-8)" && export CC=$_
   --without-java \
   --with-python=no \
   --without-gtk
-make %{?_smp_mflags} V=1
+%make_build
 
 %install
 %make_install