From 658da811302fec4ca44f10f01e647a28d003520f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Tue, 11 Apr 2017 14:03:39 -0300
Subject: [PATCH] Bump to version 0.20

Point to the new place where we're storing zbar tarballs
and bump it to version 0.20.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 .gitignore |  1 +
 sources    |  2 +-
 zbar.spec  | 27 ++++++++-------------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0c8280..4776e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 zbar-0.10.tar.bz2
 /zbar-0.10.tar.bz2
+/zbar-0.20.tar.bz2
diff --git a/sources b/sources
index e58d80a..b19f94e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8b9dddcf28d6603d8b066816941a9d2  zbar-0.10.tar.bz2
+SHA512 (zbar-0.20.tar.bz2) = 776c75c1b43197645b0daa2e490dbe7ccf7fe0117a6bf96325357904c8974880a313a55dc1c5c8c8dc5bc7a94ce2dd762cdd203fdf1e0bce6b30d5ce9dc1bc29
diff --git a/zbar.spec b/zbar.spec
index 4df8ab7..9958342 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -2,21 +2,14 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           zbar
-Version:        0.10
-Release:        29%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
 License:        LGPLv2+
 URL:            http://zbar.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		zbar_update_to_hg.patch
-Patch1:		zbar_use_libv4l.patch
-Patch2:		zbar_choose_supported_format_first.patch
-Patch3:		zbar_use_REQBUFS_properly.patch
-Patch4:		zbar_configure_ac_use_m4_pattern_allow.patch
-Patch5:		zbar_add_support_for_qt5.patch
-Patch6:		zbar_generate_qt_gtk_apps.patch
+Source0:        https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
@@ -89,17 +82,10 @@ scanning widget.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 autoreconf -vfi
-%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
+%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
 
 # rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -115,7 +101,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f
 
 # Remove installed doc
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-0.10/
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -191,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Tue Apr 11 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.20-1
+- Update it to version 0.20 with brings V4L2 controls to zbarcam-qt
+
 * Sun Mar 26 2017 Mauro Carvalho Chehab <mchehab@s-opensource.com> - 0.10-29
 - Make zbar-qt to use Qt5 and generate gtk and qt applications