From b813ae048a9f04961a3f9fa07970f78f73d813dff3ed44f92524bbf9c99be35c Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 6 Aug 2012 17:28:37 +0000
Subject: [PATCH] fix build

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=6
---
 fix_build.patch              | 15 +++++++++++++++
 zbar-0.10_2011_11_19.tar.bz2 |  3 ---
 zbar-0.10_2012_08_06.tar.bz2 |  3 +++
 zbar.changes                 |  5 +++++
 zbar.spec                    | 11 ++++++++---
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 fix_build.patch
 delete mode 100644 zbar-0.10_2011_11_19.tar.bz2
 create mode 100644 zbar-0.10_2012_08_06.tar.bz2

diff --git a/fix_build.patch b/fix_build.patch
new file mode 100644
index 0000000..20547bb
--- /dev/null
+++ b/fix_build.patch
@@ -0,0 +1,15 @@
+diff -ur zbar-0.10_2012_08_06/configure.ac zbar-0.10_2012_08_06_fix/configure.ac
+--- zbar-0.10_2012_08_06/configure.ac	2012-08-06 18:29:28.271138221 +0200
++++ zbar-0.10_2012_08_06_fix/configure.ac	2012-08-06 19:12:42.396126332 +0200
+@@ -3,9 +3,10 @@
+ AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(config)
+-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
++AM_INIT_AUTOMAKE([1.10 -Wall foreign subdir-objects std-options dist-bzip2])
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_CONFIG_SRCDIR(zbar/scanner.c)
++AM_PROG_AR
+ LT_PREREQ([2.2])
+ LT_INIT([dlopen win32-dll])
+ LT_LANG([Windows Resource])
diff --git a/zbar-0.10_2011_11_19.tar.bz2 b/zbar-0.10_2011_11_19.tar.bz2
deleted file mode 100644
index 1e85401..0000000
--- a/zbar-0.10_2011_11_19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:167ce5f52702dfbfa0b95ee26969ad6107cbec5e5bf33104669c19cde04703ae
-size 618404
diff --git a/zbar-0.10_2012_08_06.tar.bz2 b/zbar-0.10_2012_08_06.tar.bz2
new file mode 100644
index 0000000..1316e41
--- /dev/null
+++ b/zbar-0.10_2012_08_06.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbd7cc947f20676bf106b7760f3d246189a0cac66ae68841ae39a375028fb66a
+size 649958
diff --git a/zbar.changes b/zbar.changes
index e9ca685..a924db7 100644
--- a/zbar.changes
+++ b/zbar.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  6 17:19:54 UTC 2012 - opensuse@dstoecker.de
+
+- fix build, update to recent mercurial revision from 2012-08-06
+
 -------------------------------------------------------------------
 Sat Nov 19 23:06:38 UTC 2011 - opensuse@dstoecker.de
 
diff --git a/zbar.spec b/zbar.spec
index 465af3b..6c7efc7 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -18,20 +18,22 @@
 %define libname libzbar0
 
 Name:           zbar
-Version:        0.10_2011_11_19
+Version:        0.10_2012_08_06
 Release:        1
 Summary:        Bar code reader
 Group:          Productivity/Other
-License:        LGPLv2.1+
+License:        LGPL-2.1+
 Url:            http://zbar.sourceforge.net
 BuildRequires:  ImageMagick-devel libqt4-devel gtk2-devel python-gtk-devel
 # required by mercurial archive only
 BuildRequires:  xmlto
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  libtool
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
+Patch1:         fix_build.patch
 
 %description
 ZBar is an open source software suite for reading bar codes from various
@@ -158,8 +160,9 @@ Authors:
 
 %prep
 %setup -q
+%patch1 -p1
 # for the Mercurial-based archive we need to get proper autoconf files
-autoreconf -i
+autoreconf -fi
 
 %build
 # Mercurial only? - This should not be required in a final release version!
@@ -198,6 +201,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %_includedir/%{name}
 %_includedir/zbar.h
 %_includedir/%{name}/*.h
+%exclude %_includedir/%{name}/zbargtk.h
+%exclude %_includedir/%{name}/QZBar*.h
 %_libdir/libzbar.so
 %_libdir/libzbar.so.0
 %_libdir/pkgconfig/zbar.pc