diff --git a/zbar.spec b/zbar.spec index 7eaf7ac..a68f6be 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,16 +1,12 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: zbar Version: 0.20.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bar code reader Group: User Interface/X Hardware Support License: LGPLv2+ URL: http://zbar.sourceforge.net/ Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 -Patch0: zbar_fedora29_hack_for_codegen_to_work.patch BuildRequires: autoconf automake libtool gettext-devel BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel @@ -82,7 +78,6 @@ scanning widget. %prep %setup -q -%patch0 -p1 %build autoreconf -vfi @@ -104,24 +99,17 @@ find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f # Remove installed doc rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ -%post -p /sbin/ldconfig - -%post devel -p /sbin/ldconfig - -%post gtk -p /sbin/ldconfig +%ldconfig_scriptlets -%post qt -p /sbin/ldconfig +%ldconfig_scriptlets devel -%postun -p /sbin/ldconfig +%ldconfig_scriptlets gtk -%postun devel -p /sbin/ldconfig - -%postun gtk -p /sbin/ldconfig - -%postun qt -p /sbin/ldconfig +%ldconfig_scriptlets qt %files -%doc COPYING LICENSE NEWS +%doc NEWS +%license COPYING LICENSE %{_bindir}/zbarimg %{_bindir}/zbarcam @@ -168,6 +156,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %{_includedir}/zbar/QZBar*.h %changelog +* Thu Aug 9 2018 Hans de Goede - 0.20.1-3 +- Drop zbar_fedora29_hack_for_codegen_to_work.patch now that pygobject2 is + fixed (rhbz# 1606784) +- Use %%ldconfig_scriptlets so that we don't unnecessarily run ldconfig on F28+ + * Wed Aug 08 2018 Mauro Carvalho Chehab - 0.20.1-2 - Re-enable python2 bindings diff --git a/zbar_fedora29_hack_for_codegen_to_work.patch b/zbar_fedora29_hack_for_codegen_to_work.patch deleted file mode 100644 index d9d3fb9..0000000 --- a/zbar_fedora29_hack_for_codegen_to_work.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc -index 433412c8bcb5..33c65ad8975b 100644 ---- a/pygtk/Makefile.am.inc -+++ b/pygtk/Makefile.am.inc -@@ -18,6 +18,8 @@ pygtk/zbarpygtk.defs: include/zbar/zbargtk.h - $(SED) -e 's/Z_TYPE_BAR_/ZBAR_TYPE_/' > $@ - - pygtk/%.c: pygtk/%.defs $(srcdir)/pygtk/zbarpygtk.override -- $(PYGTK_CODEGEN) --prefix zbarpygtk \ -+ env $(PYGTK_CODEGEN) |sed s,python,python2, > ./codegen.sh -+ chmod 755 ./codegen.sh -+ ./codegen.sh --prefix zbarpygtk \ - --register $(PYGTK_DEFS)/gdk-types.defs \ - --override $(srcdir)/pygtk/zbarpygtk.override $< > $@