From 6deccd757c2f237c8e7bb7db440d522bb4e27dfd Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Sat, 11 May 2019 13:52:52 -0300
Subject: [PATCH] Bump to 0.22.91

Has some build fixes. While here, enable python3 bindings build.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50ed0db..6a5fd49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ zbar-0.10.tar.bz2
 /zbar-0.22.2.tar.gz
 /zbar-0.22.2.tar.bz2
 /zbar-0.22.90.tar.bz2
+/zbar-0.22.91.tar.bz2
diff --git a/sources b/sources
index 509c708..2aefe91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zbar-0.22.90.tar.bz2) = fd21747dd7c40b2a3a0c958b18d0947905edb32424aa85efed7610aefb7167173b563656c4f201781f7f9b3bbb64d946a39b2089bac8aeccca823d4fb01e104d
+SHA512 (zbar-0.22.91.tar.bz2) = c64a9d6b21e5da9dc583ed2f2098402093e6932ce2383e49ecb7a6db18418456f039381f9fda4e9276e59fea2b1e7cd1f01cf32977e4eb9c6a3391d36228c5ae
diff --git a/zbar.spec b/zbar.spec
index 775d032..950e9e1 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -1,17 +1,19 @@
 Name:		zbar
-Version:	0.22.90
+Version:	0.22.91
 Release:	1%{?dist}
 Summary:	Bar code reader
 
 License:	LGPLv2+
 URL:		http://zbar.sourceforge.net/
 Source0:	https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		use_python3_on_python_script.patch
 
 BuildRequires:	autoconf automake libtool gettext-devel
 BuildRequires:	qt5-qtbase-devel qt5-qtx11extras-devel
 BuildRequires:	gtk3-devel ImageMagick-devel pygobject3-devel
 BuildRequires:	libv4l-devel libXv-devel xmlto dbus-devel
 BuildRequires:	java-11-openjdk-devel
+BuildRequires:	python3-devel
 
 %description
 A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -70,6 +72,15 @@ This package contains header files and additional libraries used for
 developing GUI applications based on Qt4 that include a bar code
 scanning widget.
 
+%package python3
+Group: Development/Libraries
+Summary: Bar code reader PyGTK widget
+Requires: python3-pillow, %{name} = %{version}-%{release}
+
+%description python3
+This package contains a bar code scanning widget for use on
+python applications that work with images.
+
 %package java
 Summary: Bar code reader Java library
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
@@ -81,10 +92,11 @@ on Java Native Interface (JNI) applications using ZBar.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 autoreconf -vfi
-%configure --without-python --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
+%configure --with-python=python3 --with-gtk=auto --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -98,6 +110,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 install -d %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/zbar.jar %{buildroot}%{_jnidir}
 mv %{buildroot}%{_datadir}/zbar/lib/libzbarjni.so* %{buildroot}%{_libdir}
+cp test/test_python.py %{buildroot}%{_docdir}
 
 #Remove .la and .a files
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
@@ -168,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_jnidir}/zbar.jar
 %{_libdir}/libzbarjni.so*
 
+%files python3
+%{python3_sitearch}/zbar.so
+%{_docdir}/test_python.py
+
 %changelog
 * Fri May 10 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.90-1
 - Release candidate for 0.23. Support for Gtk3 and GObject Introspection (GIR)