Bump to version 0.23

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Bump to the third release candidate for 0.23
2019-05-23 19:31:06 -03:00 · 2019-05-14 07:29:21 -03:00 · 2019-05-11 16:59:41 -03:00 · 2019-05-11 14:11:32 -03:00 · 2019-05-11 13:06:58 -03:00 · 2019-02-20 07:20:26 -03:00
4 changed files with 84 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,4 @@
-zbar-0.10.tar.bz2
-/zbar-0.10.tar.bz2
-/zbar-0.20.tar.bz2
-/zbar-0.20.1.tar.bz2
-/zbar-0.21.tar.bz2
+/zbar-0.22.90.tar.bz2
+/zbar-0.22.91.tar.bz2
+/zbar-0.22.92.tar.bz2
+/zbar-0.23.tar.bz2
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (zbar-0.21.tar.bz2) = 8c1095ec234b04839229dd6345b0758f0a133c715f28031ab64c2c7809a0c0fc4cbd7226fba1a6e3c40efcb8b2a334a7e461cdc34a77c21b537dbf8faf38c14c
+SHA512 (zbar-0.23.tar.bz2) = 7eef2ee99760edd693ecc12a36e04b71a156b93b4c1977ca4f6da103a955284cf640b55adb185477e1d4cc65345bb01608ed9528f6518abb514ccbc58e5d350b
--- a/use_python3_on_python_script.patch
+++ b/use_python3_on_python_script.patch
@ -0,0 +1,10 @@
+diff --git a/test/test_python.py b/test/test_python.py
+index 252c51a97256..8388d9a5aa36 100755
+--- a/test/test_python.py
+++ b/test/test_python.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/env python3
+ #------------------------------------------------------------------------
+ #  Copyright 2019 (c) Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+ #
--- a/zbar.spec
+++ b/zbar.spec
@ -1,16 +1,19 @@
 Name:		zbar
-Version:	0.21
+Version:	0.23
 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:	gtk2-devel GraphicsMagick-c++-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,
@ -34,6 +37,15 @@ Requires: %{name} = %{version}-%{release}
 This package contains a bar code scanning widget for use with GUI
 applications based on GTK+-2.0.

+%package gi
+Summary: Bar code reader GObject Introspection (GIR) Gtk bindings
+Requires: %{name}-gtk = %{version}-%{release}
+
+%description gi
+This package contains a bar code scanning GObject Introspection
+(GIR) Gtk bindings, with allow the usage of ZBar with GUI
+support on any application compatible with GIR, like python3.
+
 %package gtk-devel
 Summary: Bar code reader GTK widget extra development files
 Requires: pkgconfig, %{name}-gtk = %{version}-%{release}, %{name}-devel = %{version}-%{release}
@ -60,12 +72,31 @@ 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}
+
+%description java
+This package contains header files and additional libraries used for
+on Java Native Interface (JNI) applications using ZBar.
+
+
 %prep
 %setup -q
+%patch0 -p1

 %build
 autoreconf -vfi
-%configure --without-java --with-graphicsmagick --without-python2 --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
@ -76,6 +107,10 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 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
@ -92,8 +127,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %ldconfig_scriptlets qt

 %files
-%doc NEWS README.md INSTALL.md
-%license COPYING LICENSE
+%doc NEWS.md README.md INSTALL.md
+%license COPYING LICENSE.md

 %{_bindir}/zbarimg
 %{_bindir}/zbarcam
@ -102,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf

 %files devel
-%doc HACKING TODO
+%doc HACKING.md TODO.md

 %{_libdir}/libzbar.so
 %{_libdir}/pkgconfig/zbar.pc
@ -122,6 +157,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/libzbargtk.so.*
 %{_bindir}/zbarcam-gtk

+%files gi
+%dir %{_libdir}/girepository-1.0
+%dir %{_datadir}/gir-1.0
+%{_libdir}/girepository-1.0/ZBar-1.0.typelib
+%{_datadir}/gir-1.0/ZBar-1.0.gir
+
 %files gtk-devel
 %{_libdir}/libzbargtk.so
 %{_libdir}/pkgconfig/zbar-gtk.pc
@ -136,8 +177,29 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
 %{_libdir}/pkgconfig/zbar-qt.pc
 %{_includedir}/zbar/QZBar*.h

+%files java
+%{_jnidir}/zbar.jar
+%{_libdir}/libzbarjni.so*
+
+%files python3
+%{python3_sitearch}/zbar.so
+%{_docdir}/test_python.py
+
 %changelog
-* Tue Feb 12 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-4
+* Thu May 23 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.23-1
+- Bump to release 0.23.
+
+
+* Tue May 14 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22.92-1
+- Third release candidate for 0.23.
+
+* 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)
+
+* Wed Feb 20 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.22-1
+- Bump to version 0.22: zbarcam-qt is now a full-featured application
+
+* Tue Feb 12 2019 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.21-1
 - Bump to version 0.21: d-bus and SQ code support, improved zbarcam-qt

 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-5
Author	SHA1	Message	Date
Mauro Carvalho Chehab	0d841f40e2	Bump to version 0.23 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-05-23 19:31:06 -03:00
Mauro Carvalho Chehab	ade3b6641b	Bump to the third release candidate for 0.23 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-05-14 07:29:21 -03:00
Mauro Carvalho Chehab	be2309ac3a	Some fixes for zbar-python build In order to be able to build a zbar-python, we need to address some small things. Among them, there's a requirement to use "python3" at python's test script. IMHO, that's a bad idea, at least upstream, as the same script also works with python2 when using pygtk (also supported by ZBar). Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-05-11 16:59:41 -03:00
Mauro Carvalho Chehab	2cc4eaee4b	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>	2019-05-11 14:11:32 -03:00
Mauro Carvalho Chehab	9f2cd28e8f	Update to 0.23 release candidate package (0.22.90) This Release Candidate brings support for Gtk3 and GIR. Add support for it and create an extra package for GIR. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-05-11 13:06:58 -03:00
Mauro Carvalho Chehab	c117ca9658	Bump to version 0.22 The main focus of this version is to make zbarcam-qt a full-featured application, allowing to use all ZBar library features with a GUI interface. It also comes with an optional new feature to allow inverting the colors when parsing images. That's specially useful for QR codes, as it seems that several such barcodes come inverted. There are also some bug fixes on it. Sumary of changes: * zbarcam-qt: allow changing resolutions in real time * zbarcam-qt: better support ZBar options * zbarcam-qt: do several visual improvements * zbarcam-qt: make it remember the geometry * zbarcam-qt: allow show/hide control and options bars * zbarcam-qt: remember lastly used settings and camera controls * zbarcam-qt: allow changing ZBar decode options via GUI * Add API to allow get/set resolutions * img_scanner: add handler for color-inverted codes * img_scanner: fix get_config parameter validation * scan_video: improve logic to remove duplicated/invalid devnodes * symbol.c: fix symbol hash logic (prevents crash with QR options) * configure.ac: fix an error at libv4l2 package check * fix some typos * exit gracefully when decoding split QR codes Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-02-20 07:20:26 -03:00
Mauro Carvalho Chehab	3aad29f737	Update ZBar sources Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>	2019-02-20 07:20:04 -03:00