From a07425243004ffbcce24500a2c5e4a620c1892091aa5a19364287b0f15ead2a4 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 1 Nov 2017 14:53:08 +0000 Subject: [PATCH] Accepting request 538118 from home:pluskalm:branches:Application:Geo - Drop python bindings and gtk support - Cleanup with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/538118 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=26 --- baselibs.conf | 1 - zbar.changes | 6 ++++ zbar.spec | 80 +++++++-------------------------------------------- 3 files changed, 17 insertions(+), 70 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 829abed..0dbc31a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,2 @@ libzbar0 -libzbargtk0 libzbarqt0 diff --git a/zbar.changes b/zbar.changes index ec58a35..6ffa269 100644 --- a/zbar.changes +++ b/zbar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 1 14:50:59 UTC 2017 - mpluskal@suse.com + +- Drop python bindings and gtk support +- Cleanup with spec-cleaner + ------------------------------------------------------------------- Sat Aug 5 19:22:42 UTC 2017 - aloisio@gmx.com diff --git a/zbar.spec b/zbar.spec index 8c01d0d..3277b81 100644 --- a/zbar.spec +++ b/zbar.spec @@ -37,15 +37,14 @@ BuildRequires: ImageMagick-devel # required by mercurial archive only BuildRequires: autoconf BuildRequires: automake -BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel BuildRequires: libtool -BuildRequires: python-gtk-devel +BuildRequires: pkgconfig BuildRequires: xmlto BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ZBar reads bar codes from various sources, such as video streams, @@ -78,14 +77,6 @@ This package contains all necessary include files, libraries, configuration files and development tools needed to compile and link applications using the zbar library. -%package -n python-zbar -Summary: ZBar Python bindings -Group: Productivity/Other -%py_requires - -%description -n python-zbar -This package provides ZBar Python bindings. - %package -n libzbarqt0 Summary: ZBar Qt bindings Group: System/Libraries @@ -103,32 +94,6 @@ This package contains all necessary include files, libraries, configuration files and development tools needed to compile and link applications using the zbar-qt library. -%package -n libzbargtk0 -Summary: ZBar Gtk bindings -Group: System/Libraries - -%description -n libzbargtk0 -This package provides ZBar Gtk bindings. - -%package -n libzbargtk-devel -Summary: Development environment for the ZBar Gtk bindings library -Group: Development/Libraries/C and C++ -Requires: libzbargtk0 = %{version} - -%description -n libzbargtk-devel -This package contains all necessary include files, libraries, -configuration files and development tools needed to compile and link -applications using the zbar-gtk library. - -%package -n python-zbar-gtk -Summary: ZBar Python-Gtk bindings -Group: Productivity/Other -Requires: python-zbar = %{version} -%py_requires - -%description -n python-zbar-gtk -This package provides ZBar Python-Gtk bindings. - %prep %setup -q %patch1 -p1 @@ -137,39 +102,36 @@ This package provides ZBar Python-Gtk bindings. %build # for the Mercurial-based archive we need to get proper autoconf files -autoreconf -fi +autoreconf -fiv # Mercurial only? - This should not be required in a final release version! export CFLAGS="%{optflags} -Wno-error=parentheses -Wno-error=deprecated-declarations" -%configure --docdir=%{_docdir}/%{name} --disable-static +%configure \ + --docdir=%{_docdir}/%{name} \ + --disable-static \ + --without-python \ + --without-gtk make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install rm %{buildroot}%{_docdir}/zbar/INSTALL -find %{buildroot} -name '*.la' -delete +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig - %post -n libzbarqt0 -p /sbin/ldconfig %postun -n libzbarqt0 -p /sbin/ldconfig -%post -n libzbargtk0 -p /sbin/ldconfig -%postun -n libzbargtk0 -p /sbin/ldconfig - %files -%defattr(-,root,root) %doc ChangeLog README COPYING LICENSE NEWS -%_defaultdocdir/%{name}/ +%{_defaultdocdir}/%{name}/ %{_bindir}/zbar* %{_mandir}/man1/* %files -n %{libname} -%defattr(-,root,root) %{_libdir}/libzbar.so.* %files -n lib%{name}-devel -%defattr(-,root,root) %dir %{_includedir}/%{name} %{_includedir}/zbar.h %{_includedir}/%{name}/*.h @@ -178,32 +140,12 @@ find %{buildroot} -name '*.la' -delete %{_libdir}/libzbar.so %{_libdir}/pkgconfig/zbar.pc -%files -n python-zbar -%defattr(-,root,root) -%{py_sitedir}/zbar.so - %files -n libzbarqt0 -%defattr(-,root,root) %{_libdir}/libzbarqt.so.* %files -n libzbarqt-devel -%defattr(-,root,root) %{_includedir}/%{name}/QZBar*.h %{_libdir}/libzbarqt.so %{_libdir}/pkgconfig/zbar-qt.pc -%files -n libzbargtk0 -%defattr(-,root,root) -%{_libdir}/libzbargtk.so.* - -%files -n libzbargtk-devel -%defattr(-,root,root) -%{_includedir}/%{name}/zbargtk.h -%{_libdir}/libzbargtk.so -%{_libdir}/pkgconfig/zbar-gtk.pc - -%files -n python-zbar-gtk -%defattr(-,root,root) -%{py_sitedir}/zbarpygtk.so - %changelog