Hello community, here is the log from the commit of package zbar for openSUSE:Factory checked in at 2019-01-26 22:19:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zbar (Old) and /work/SRC/openSUSE:Factory/.zbar.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zbar" Sat Jan 26 22:19:41 2019 rev:7 rq:668153 version:0.20.1 Changes: -------- --- /work/SRC/openSUSE:Factory/zbar/zbar.changes 2018-04-17 11:11:23.087667111 +0200 +++ /work/SRC/openSUSE:Factory/.zbar.new.28833/zbar.changes 2019-01-26 22:19:42.482987237 +0100 @@ -1,0 +2,14 @@ +Wed Jan 23 16:13:22 UTC 2019 - [email protected] + +- Update Zbar to v0.20.1 + * switch from the old abandoned codebase to the new codebase + maintained by linuxtv.org + * improved v4l2 support + * compatible with Qt5 + * various fixes +- Removed fix_build.patch +- Removed fix-gcc5.patch +- Removed zbar-Qt5.patch +- Removed fix-gcc8.patch + +------------------------------------------------------------------- Old: ---- fix-gcc5.patch fix-gcc8.patch fix_build.patch update.sh zbar-0.10_2013_02_28.tar.bz2 zbar-Qt5.patch New: ---- zbar-0.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zbar.spec ++++++ --- /var/tmp/diff_new_pack.KQbWSo/_old 2019-01-26 22:19:42.986986828 +0100 +++ /var/tmp/diff_new_pack.KQbWSo/_new 2019-01-26 22:19:42.986986828 +0100 @@ -1,7 +1,7 @@ # # spec file for package zbar # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Carlos Goncalves <[email protected]>. # # All modifications and additions to the file contributed by third parties @@ -19,29 +19,26 @@ %define libname libzbar0 Name: zbar -Version: 0.10_2013_02_28 +Version: 0.20.1 Release: 0 Summary: Bar code reader -License: LGPL-2.1-or-later +License: LGPL-2.0-or-later Group: Productivity/Other -Url: http://zbar.sourceforge.net -Source: %{name}-%{version}.tar.bz2 + +URL: http://zbar.sourceforge.net/ +Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 Source98: baselibs.conf -# update.sh is used to create a new tarball based on the hg repository -Source99: update.sh -Patch1: fix_build.patch -Patch2: fix-gcc5.patch -# PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries <[email protected]> -Patch3: zbar-Qt5.patch -Patch4: fix-gcc8.patch + BuildRequires: ImageMagick-devel -# required by mercurial archive only BuildRequires: autoconf BuildRequires: automake -BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: libjpeg-devel +BuildRequires: libv4l-devel +BuildRequires: libXv-devel BuildRequires: xmlto +BuildRequires: python2-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) @@ -78,46 +75,49 @@ configuration files and development tools needed to compile and link applications using the zbar library. -%package -n libzbarqt0 +%package -n lib%{name}qt0 Summary: ZBar Qt bindings Group: System/Libraries -%description -n libzbarqt0 +%description -n lib%{name}qt0 This package provides ZBar Qt bindings. -%package -n libzbarqt-devel +%package -n lib%{name}qt-devel Summary: Development environment for the ZBar Qt bindings library Group: Development/Libraries/C and C++ -Requires: libzbarqt0 = %{version} +Requires: lib%{name}qt0 = %{version}, lib%{name}-devel = %{version} -%description -n libzbarqt-devel +%description -n lib%{name}qt-devel This package contains all necessary include files, libraries, configuration files and development tools needed to compile and link applications using the zbar-qt library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build # for the Mercurial-based archive we need to get proper autoconf files 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 \ + --without-java \ --without-python \ --without-gtk + +# rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} %install +rm -rf %{buildroot} %make_install -rm %{buildroot}%{_docdir}/zbar/INSTALL -find %{buildroot} -type f -name "*.la" -delete -print +find %{buildroot} -name "*.la" -or -name "*.a" | xargs rm -f +rm -rf %{buildroot}/usr/share/doc/zbar-%{version}/ +rm -f %{buildroot}/usr/share/doc/packages/zbar/{COPYING,LICENSE,INSTALL} %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -125,27 +125,39 @@ %postun -n libzbarqt0 -p /sbin/ldconfig %files -%doc ChangeLog README COPYING LICENSE NEWS +%doc NEWS +%license COPYING LICENSE %{_defaultdocdir}/%{name}/ -%{_bindir}/zbar* +%{_bindir}/zbarimg +%{_bindir}/zbarcam +%{_bindir}/zbarcam-qt %{_mandir}/man1/* %files -n %{libname} %{_libdir}/libzbar.so.* +%exclude %{python2_sitearch}/zbar.so +%exclude %{_includedir}/zbar/zbargtk.h %files -n lib%{name}-devel +%doc HACKING TODO %dir %{_includedir}/%{name} %{_includedir}/zbar.h -%{_includedir}/%{name}/*.h -%exclude %{_includedir}/%{name}/zbargtk.h -%exclude %{_includedir}/%{name}/QZBar*.h +%{_includedir}/zbar/Exception.h +%{_includedir}/zbar/Symbol.h +%{_includedir}/zbar/Image.h +%{_includedir}/zbar/Scanner.h +%{_includedir}/zbar/Decoder.h +%{_includedir}/zbar/ImageScanner.h +%{_includedir}/zbar/Video.h +%{_includedir}/zbar/Window.h +%{_includedir}/zbar/Processor.h %{_libdir}/libzbar.so %{_libdir}/pkgconfig/zbar.pc -%files -n libzbarqt0 +%files -n lib%{name}qt0 %{_libdir}/libzbarqt.so.* -%files -n libzbarqt-devel +%files -n lib%{name}qt-devel %{_includedir}/%{name}/QZBar*.h %{_libdir}/libzbarqt.so %{_libdir}/pkgconfig/zbar-qt.pc ++++++ zbar-0.10_2013_02_28.tar.bz2 -> zbar-0.20.1.tar.bz2 ++++++ ++++ 3986 lines of diff (skipped)
