Re-enable python 2 bindings

Now that it builds with python2, re-enable its bindings.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
epel9
Mauro Carvalho Chehab 7 years ago
parent 1c1368e0a4
commit ff4c638d36

@ -3,7 +3,7 @@
Name: zbar
Version: 0.20.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Bar code reader
Group: User Interface/X Hardware Support
@ -16,11 +16,7 @@ BuildRequires: autoconf automake libtool gettext-devel
BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel
BuildRequires: gtk2-devel GraphicsMagick-c++-devel
BuildRequires: libv4l-devel libXv-devel xmlto
%if 0%{?fedora}
BuildRequires: python2-devel pygtk2-devel
%else
%global without_python --without-python
%endif
%description
A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128,
@ -56,7 +52,6 @@ This package contains header files and additional libraries used for
developing GUI applications based on GTK+-2.0 that include a bar code
scanning widget.
%if 0%{?fedora}
%package pygtk
Group: Development/Libraries
Summary: Bar code reader PyGTK widget
@ -65,7 +60,6 @@ Requires: pygtk2, python2-pillow, %{name}-gtk = %{version}-%{release}
%description pygtk
This package contains a bar code scanning widget for use in GUI
applications based on PyGTK.
%endif
%package qt
Group: Development/Libraries
@ -92,7 +86,7 @@ scanning widget.
%build
autoreconf -vfi
%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version} %{?without_python}
%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version}
# rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -160,11 +154,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
%{_libdir}/pkgconfig/zbar-gtk.pc
%{_includedir}/zbar/zbargtk.h
%if 0%{?fedora}
%files pygtk
%{python2_sitearch}/zbarpygtk.so
%{python2_sitearch}/zbar.so
%endif
%files qt
%{_libdir}/libzbarqt.so.*
@ -176,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/
%{_includedir}/zbar/QZBar*.h
%changelog
* Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-2
- Re-enable python2 bindings
* Wed Aug 08 2018 Mauro Carvalho Chehab <mchehab+samsung@kernel.org> - 0.20.1-1
- Bump version to 0.20.1

Loading…
Cancel
Save