Accepting request 849552 from Application:Geo

- Update to version 0.23.1
  * Add i18n translation support and add a pt_BR translation
  * Change default to autodetect python and gtk versions
  * Some documentation updates
  * Add support for binary data extraction
  * Add support for raw decoding without charset conversions
  * Add one shot scanning mode
  * Fix help messages
  * Fix some makefile issues
  * Fix error detection in video4linux read
  * Fix pkgconfig for zbar-qt5
  * Fix a double-free condition
- Add 0002-get-rid-of-gettext_h.patch

OBS-URL: https://build.opensuse.org/request/show/849552
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zbar?expand=0&rev=13

0001-Create-correct-pkconfig-file-for-zbar-qt5.patch

@@ -13,44 +13,6 @@ Fixes issue #62.
  2 files changed, 22 insertions(+), 3 deletions(-)
  create mode 100644 zbar-qt5.pc.in
 
-diff --git a/configure.ac b/configure.ac
-index 935110a..49ef6a8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
-      CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
- dnl -fPIC has no effect on Windows and breaks windres
-      AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt5.pc"
-+     ],
- 
-     [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt.pc"
-+     ]))
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-+AM_COND_IF([HAVE_QT],
-+     [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
-+)
-+
- dnl Java
- have_java="maybe"
- 
-@@ -820,7 +828,6 @@ java/Makefile
- zbar/Makefile
- zbar.pc
- zbar-gtk.pc
--zbar-qt.pc
- doc/doxygen.conf])
- 
- AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
 diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
 new file mode 100644
 index 0000000..3378993

0002-get-rid-of-gettext_h.patch

@@ -0,0 +1,36 @@
+commit a133aea7880bbb56d75535e534716d0e16a3b61a
+Author: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date:   Tue Jul 28 09:47:03 2020 +0200
+
+    zbarcam, zbarimg: get rid of gettext.h
+    
+    This doesn't seem to be needed at all for translations to
+    work. Also, gettext.h uses a different license. So, let's get
+    rid of it.
+    
+    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+
+diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
+index f7ea281..ad30101 100644
+--- a/zbarcam/zbarcam.c
++++ b/zbarcam/zbarcam.c
+@@ -35,7 +35,6 @@
+ #include <zbar.h>
+ 
+ #ifdef ENABLE_NLS
+-#include "../zbar/gettext.h"
+ # include <libintl.h>
+ # define _(string) gettext(string)
+ #else
+diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
+index 0796fd8..d05d832 100644
+--- a/zbarimg/zbarimg.c
++++ b/zbarimg/zbarimg.c
+@@ -40,7 +40,6 @@
+ #include <zbar.h>
+ 
+ #ifdef ENABLE_NLS
+-#include "../zbar/gettext.h"
+ # include <libintl.h>
+ # define _(string) gettext(string)
+ #else

zbar-0.23.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f
+size 1195599

zbar-0.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e99fb8f3be85a76fe24784ad67fecb2da3a02b1e432696b05eefe212d448ad2e
-size 1168183

zbar.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov 18 02:54:31 UTC 2020 - Wang Jun <jgwang@suse.com>
+
+- Update to version 0.23.1
+  * Add i18n translation support and add a pt_BR translation
+  * Change default to autodetect python and gtk versions
+  * Some documentation updates
+  * Add support for binary data extraction
+  * Add support for raw decoding without charset conversions
+  * Add one shot scanning mode
+  * Fix help messages
+  * Fix some makefile issues
+  * Fix error detection in video4linux read
+  * Fix pkgconfig for zbar-qt5
+  * Fix a double-free condition
+- Add 0002-get-rid-of-gettext_h.patch
+
 -------------------------------------------------------------------
 Sun Oct 20 11:40:04 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

zbar.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zbar
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2010 Carlos Goncalves <cgoncalves@opensuse.org>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
 %define sover   0
 %define libname lib%{name}%{sover}
 Name:           zbar
-Version:        0.23
+Version:        0.23.1
 Release:        0
 Summary:        Bar code reader
 License:        LGPL-2.0-or-later
@@ -30,11 +30,8 @@ Source0:        https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2
 Source98:       baselibs.conf
 # PATCH-FIX-UPSTREAM -- https://github.com/mchehab/zbar/pull/63
 Patch0:         0001-Create-correct-pkconfig-file-for-zbar-qt5.patch
-# autoconf/automake required due to patched configure.ac (Patch0)
+# PATCH-FIX-UPSTREAM -- https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a
-%if 0%{?suse_version} >= 1550
+Patch1:         0002-get-rid-of-gettext_h.patch
-BuildRequires:  autoconf
-BuildRequires:  automake >= 1.16
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  xmlto
@@ -50,6 +47,11 @@ 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
@@ -108,6 +110,7 @@ applications using the zbar-qt library.
 %if 0%{?suse_version} >= 1550
 %patch0 -p1
 %endif
+%patch1 -p1
 
 %build
 test -x "$(type -p gcc)" && export CC=$_
@@ -127,6 +130,7 @@ find %{buildroot} -name "*.la"  -or -name "*.a" | xargs rm -f
 rm -rf %{buildroot}%{_datadir}/doc/zbar-%{version}/
 rm -f %{buildroot}%{_docdir}/zbar/{COPYING,LICENSE.md,INSTALL.md}
 
+%{find_lang} %{name}
 # Lets wait for review first
 rm -rf %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf
 
@@ -135,7 +139,7 @@ rm -rf %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf
 %post -n libzbarqt0 -p /sbin/ldconfig
 %postun -n libzbarqt0 -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %license COPYING LICENSE.md
 %{_defaultdocdir}/%{name}/
 %{_bindir}/zbarimg