diff --git a/zbar-0.20.1.tar.bz2 b/zbar-0.20.1.tar.bz2 deleted file mode 100644 index 6fd4430..0000000 Binary files a/zbar-0.20.1.tar.bz2 and /dev/null differ diff --git a/zbar-0.22.tar.bz2 b/zbar-0.22.tar.bz2 new file mode 100644 index 0000000..ac362e1 Binary files /dev/null and b/zbar-0.22.tar.bz2 differ diff --git a/zbar.spec b/zbar.spec index bd02ba4..f628b05 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,81 +1,129 @@ -Name: zbar -Version: 0.20.1 -Release: 4 -Summary: Bar code reader -License: LGPLv2+ -URL: http://zbar.sourceforge.net/ -Source0: https://linuxtv.org/downloads/%{name}/%{name}-%{version}.tar.bz2 +Name: zbar +Version: 0.22 +Release: 1 +Summary: Bar code reader +License: LGPLv2+ +URL: http://zbar.sourceforge.net/ +Source0: https://linuxtv.org/downloads/zbar/zbar-%{version}.tar.bz2 -BuildRequires: autoconf automake libtool gettext-devel qt5-qtbase-devel qt5-qtx11extras-devel gtk2-devel -BuildRequires: GraphicsMagick-c++-devel libv4l-devel libXv-devel xmlto python2-devel pygtk2-devel -Requires: pygtk2 python2-pillow -Provides: %{name}-gtk = %{version}-%{release} %{name}-pygtk = %{version}-%{release} %{name}-qt = %{version}-%{release} -Obsoletes: %{name}-gtk < %{version}-%{release} %{name}-pygtk < %{version}-%{release} %{name}-qt < %{version}-%{release} +BuildRequires: autoconf automake libtool gettext-devel +BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel gtk2-devel GraphicsMagick-c++-devel +BuildRequires: libv4l-devel libXv-devel xmlto dbus-devel %description -ZBar is an open source software suite for reading bar codes from various sources, such as video streams, -image files and raw intensity sensors. It supports many popular symbologies (types of bar codes) including -EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. - -The flexible, layered implementation facilitates bar code scanning and decoding for any application: use it -stand-alone with the included GUI and command line programs, easily integrate a bar code scanning widget into -your Qt, GTK+ or PyGTK GUI application, leverage one of the script or programming interfaces (Python, Perl, -C++) ...all the way down to a streamlined C library suitable for embedded use. +A layered bar code scanning and decoding library. Supports EAN, UPC, Code 128, +Code 39 and Interleaved 2 of 5. +Includes applications for decoding captured bar code images and using a video +device (e. g., webcam) as a bar code scanner. %package devel -Summary: Bar code library extra development files -Requires: pkgconfig %{name} = %{version}-%{release} -Provides: %{name}-gtk-devel = %{version}-%{release} %{name}-qt-devel = %{version}-%{release} -Obsoletes: %{name}-gtk-devel < %{version}-%{release} %{name}-qt-devel < %{version}-%{release} +Summary: Bar code library extra development files +Requires: pkgconfig, zbar = %{version}-%{release} %description devel -This zbar-devel package contains header files and additional libraries used for developing applications -that read bar codes with this library. +This package contains header files and additional libraries used for +developing applications that read bar codes with this library. -%package help -Summary: Help package for zbar +%package gtk +Summary: Bar code reader GTK widget +Requires: zbar = %{version}-%{release} -%description help -This package contains some man help files for zbar. +%description gtk +This package contains a bar code scanning widget for use with GUI +applications based on GTK+-2.0. + +%package gtk-devel +Summary: Bar code reader GTK widget extra development files +Requires: pkgconfig, zbar-gtk = %{version}-%{release}, zbar-devel = %{version}-%{release} + +%description gtk-devel +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. + +%package qt +Summary: Bar code reader Qt widget +Requires: zbar = %{version}-%{release} + +%description qt +This package contains a bar code scanning widget for use with GUI +applications based on Qt4. + +%package qt-devel +Summary: Bar code reader Qt widget extra development files +Requires: pkgconfig, zbar-qt = %{version}-%{release}, zbar-devel = %{version}-%{release} + +%description qt-devel +This package contains header files and additional libraries used for +developing GUI applications based on Qt4 that include a bar code +scanning widget. %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q %build autoreconf -vfi -%configure --without-java --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version} +%configure --without-java --with-graphicsmagick --without-python2 --docdir=%{_docdir}/zbar-%{version} 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_build +make %{?_smp_mflags} %install -%make_install INSTALL="install -p" -%delete_la_and_a +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post devel -p /sbin/ldconfig - -%postun devel -p /sbin/ldconfig +%ldconfig_scriptlets +%ldconfig_scriptlets devel +%ldconfig_scriptlets gtk +%ldconfig_scriptlets qt %files -%doc COPYING LICENSE NEWS -%{_bindir}/* -%{_libdir}/*.so.* -%{python2_sitearch}/*.so +%doc NEWS README.md INSTALL.md +%license COPYING LICENSE +%{_bindir}/zbarimg +%{_bindir}/zbarcam +%{_libdir}/libzbar.so.* +%{_mandir}/man1/* +%{_sysconfdir}/dbus-1/system.d/org.linuxtv.Zbar.conf %files devel %doc HACKING TODO -%{_libdir}/*.so -%{_libdir}/pkgconfig/* -%{_includedir}/* +%{_libdir}/libzbar.so +%{_libdir}/pkgconfig/zbar.pc +%dir %{_includedir}/zbar +%{_includedir}/zbar.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 -%files help -%{_mandir}/man1/* +%files gtk +%{_libdir}/libzbargtk.so.* +%{_bindir}/zbarcam-gtk + +%files gtk-devel +%{_libdir}/libzbargtk.so +%{_libdir}/pkgconfig/zbar-gtk.pc +%{_includedir}/zbar/zbargtk.h + +%files qt +%{_libdir}/libzbarqt.so.* +%{_bindir}/zbarcam-qt + +%files qt-devel +%{_libdir}/libzbarqt.so +%{_libdir}/pkgconfig/zbar-qt.pc +%{_includedir}/zbar/QZBar*.h %changelog -* Tue Dec 3 2019 lingsheng - 0.20.1-4 +* Thu Oct 22 2020 caodongxia - 0.22-1 +- update package from 0.20.1 to 0.22 + +* Tue Dec 3 2019 lingsheng - 0.20.1-4 - Package init diff --git a/zbar.yaml b/zbar.yaml new file mode 100644 index 0000000..7410f05 --- /dev/null +++ b/zbar.yaml @@ -0,0 +1,4 @@ +version_control: hg +src_repo: http://hg.code.sf.net/p/zbar/code +tag_prefix: "^" +separator: "."