- up to 0.23.90

diff --git a/zbar-missing-files.patch b/zbar-missing-files.patch
index 4e9b9c57afdfbe5146743f10c34a6c94384c6289..738cfa907fa4a60d6d188540aaa20c801e9722c6 100644 (file)
--- a/zbar-missing-files.patch
+++ b/zbar-missing-files.patch
@@ -1,33 +1,3 @@
---- zbar-0.23.1/zbar-qt.pc.in.orig     1970-01-01 01:00:00.000000000 +0100
-+++ zbar-0.23.1/zbar-qt.pc.in  2020-09-12 21:48:26.551403984 +0200
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: zbar-qt
-+Description: bar code scanning and decoding Qt4 widget
-+URL: http://zbar.sourceforge.net
-+Version: @VERSION@
-+Requires: zbar, QtCore >= 4, QtGui >= 4
-+Libs: -L${libdir} -lzbarqt
-+Cflags: -I${includedir}
---- zbar-0.23.1/zbar-qt5.pc.in.orig    1970-01-01 01:00:00.000000000 +0100
-+++ zbar-0.23.1/zbar-qt5.pc.in 2020-09-12 21:48:26.551403984 +0200
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: zbar-qt
-+Description: bar code scanning and decoding Qt5 widget
-+URL: http://zbar.sourceforge.net
-+Version: @VERSION@
-+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
-+Libs: -L${libdir} -lzbarqt
-+Cflags: -I${includedir}
 --- zbar-0.23.1/pygtk/zbarpygtk.override.orig  1970-01-01 01:00:00.000000000 +0100
 +++ zbar-0.23.1/pygtk/zbarpygtk.override       2020-09-12 22:11:40.240520389 +0200
 @@ -0,0 +1,20 @@

diff --git a/zbar-no-gettext.h.patch b/zbar-no-gettext.h.patch
deleted file mode 100644 (file)
index 3009488..0000000
--- a/zbar-no-gettext.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Tue, 28 Jul 2020 09:47:03 +0200
-Subject: 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>
----
- zbar/gettext.h    | 294 ------------------------------------------------------
- zbarcam/zbarcam.c |   1 -
- zbarimg/zbarimg.c |   1 -
- 3 files changed, 296 deletions(-)
- delete mode 100644 zbar/gettext.h
-
-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
--- 
-cgit v1.2.1
-

diff --git a/zbar.spec b/zbar.spec
index d0873aebc63296ec464395c936d61035a3665f0a..ec68f708c6449b197164a456a57100094f8077dd 100644 (file)
--- a/zbar.spec
+++ b/zbar.spec
@@ -13,20 +13,19 @@
 Summary:       ZBar Bar Code Reader
 Summary(pl.UTF-8):     ZBar - czytnik kodów paskowych
 Name:          zbar
-Version:       0.23.1
-Release:       5
+Version:       0.23.90
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 # no releases since 2009
 #Source0:      http://downloads.sourceforge.net/zbar/%{name}-%{version}.tar.bz2
 # non-maintainer release
 Source0:       https://linuxtv.org/downloads/zbar/%{name}-%{version}.tar.bz2
-# Source0-md5: 5f8fc224e5ee924b6dd1032b944d0b3a
+# Source0-md5: 5acc043376cad65e8c6a8b0a5eed7e1b
 Patch0:                %{name}-sh.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-npapi.patch
 Patch3:                %{name}-missing-files.patch
-Patch4:                %{name}-no-gettext.h.patch
 URL:           http://zbar.sourceforge.net/
 BuildRequires: ImageMagick-devel >= 1:6.2.6
 BuildRequires: autoconf >= 2.68
@@ -282,7 +281,6 @@ Wtyczka ZBar dla przeglądarek WWW.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}