Author: qboosh Date: Fri Dec 31 13:44:31 2010 GMT Module: packages Tag: HEAD ---- Log message: - new
---- Files affected: packages/zbar: zbar-link.patch (NONE -> 1.1) (NEW), zbar-npapi.patch (NONE -> 1.1) (NEW), zbar.spec (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/zbar/zbar-link.patch diff -u /dev/null packages/zbar/zbar-link.patch:1.1 --- /dev/null Fri Dec 31 14:44:31 2010 +++ packages/zbar/zbar-link.patch Fri Dec 31 14:44:26 2010 @@ -0,0 +1,20 @@ +--- zbar-0.10/configure.ac.orig 2009-10-23 20:16:44.000000000 +0200 ++++ zbar-0.10/configure.ac 2010-12-31 08:51:29.354118583 +0100 +@@ -198,7 +198,7 @@ + [with_xshm="yes"], + [AC_MSG_FAILURE([unable to find XShmQueryVersion in $XSHM_LIBS! + specify XSHM_LIBS or configure --without-xshm to disable the extension])], +- ["$X_LIBS" "$X_PRE_LIBS" -lX11 "$X_EXTRA_LIBS" "$XSHM_LIBS"]) ++ ["$X_LIBS" -lX11 "$X_EXTRA_LIBS" "$XSHM_LIBS"]) + ]) + ]) + AM_CONDITIONAL([HAVE_XSHM], [test "x$with_xshm" = "xyes"]) +@@ -226,7 +226,7 @@ + [with_xv="yes"], + [AC_MSG_FAILURE([unable to find XvQueryExtension in $XV_LIBS! + specify XV_LIBS or configure --without-xv to disable the extension])], +- ["$X_LIBS" "$X_PRE_LIBS" -lX11 "$X_EXTRA_LIBS" "$XV_LIBS"]) ++ ["$X_LIBS" -lX11 "$X_EXTRA_LIBS" "$XV_LIBS"]) + ]) + ]) + AM_CONDITIONAL([HAVE_XV], [test "x$with_xv" = "xyes"]) ================================================================ Index: packages/zbar/zbar-npapi.patch diff -u /dev/null packages/zbar/zbar-npapi.patch:1.1 --- /dev/null Fri Dec 31 14:44:31 2010 +++ packages/zbar/zbar-npapi.patch Fri Dec 31 14:44:26 2010 @@ -0,0 +1,23 @@ +--- zbar-0.10/configure.ac.orig 2009-10-23 20:16:44.000000000 +0200 ++++ zbar-0.10/configure.ac 2010-12-31 08:51:29.354118583 +0100 +@@ -301,8 +301,8 @@ + [with_npapi="no"]) + + AS_IF([test "x$with_npapi" != "xno"], +- [PKG_CHECK_MODULES([NPAPI], [firefox-plugin]) +- NPAPI_VERSION=`$PKG_CONFIG firefox-plugin --modversion` ++ [PKG_CHECK_MODULES([NPAPI], [mozilla-plugin]) ++ NPAPI_VERSION=`$PKG_CONFIG mozilla-plugin --modversion` + AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])]) + + AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"]) +--- zbar-0.10/plugin/Makefile.am.inc.orig 2009-10-23 20:16:44.000000000 +0200 ++++ zbar-0.10/plugin/Makefile.am.inc 2010-12-31 09:37:49.426114393 +0100 +@@ -1,5 +1,5 @@ + lib_LTLIBRARIES += plugin/libzbarplugin.la + plugin_libzbarplugin_la_SOURCES = \ + plugin/plugin.c +-plugin_libzbarplugin_la_CPPFLAGS = $(MOZILLA_CFLAGS) $(AM_CPPFLAGS) +-plugin_libzbarplugin_la_LDFLAGS = $(MOZILLA_LIBS) $(AM_LDFLAGS) ++plugin_libzbarplugin_la_CPPFLAGS = $(NPAPI_CFLAGS) $(AM_CPPFLAGS) ++plugin_libzbarplugin_la_LDFLAGS = $(NPAPI_LIBS) $(AM_LDFLAGS) ================================================================ Index: packages/zbar/zbar.spec diff -u /dev/null packages/zbar/zbar.spec:1.1 --- /dev/null Fri Dec 31 14:44:31 2010 +++ packages/zbar/zbar.spec Fri Dec 31 14:44:26 2010 @@ -0,0 +1,391 @@ +# $Revision$, $Date$ +# +# Conditional build: +%bcond_with npapi # NPAPI plugin (nothing really yet) +%bcond_with tests # perform "make test" for perl module (needs X display) +# +%include /usr/lib/rpm/macros.perl +Summary: ZBar Bar Code Reader +Summary(pl.UTF-8): ZBar - czytnik kodów paskowych +Name: zbar +Version: 0.10 +Release: 1 +License: LGPL v2.1+ +Group: Libraries +Source0: http://downloads.sourceforge.net/zbar/%{name}-%{version}.tar.bz2 +# Source0-md5: 0fd61eb590ac1bab62a77913c8b086a5 +Patch0: %{name}-link.patch +Patch1: %{name}-npapi.patch +URL: http://zbar.sourceforge.net/ +BuildRequires: ImageMagick-devel >= 1:6.2.6 +BuildRequires: QtCore-devel >= 4 +BuildRequires: QtGui-devel >= 4 +BuildRequires: autoconf >= 2.61 +BuildRequires: automake >= 1:1.10 +BuildRequires: gtk+2-devel >= 2.0 +BuildRequires: libjpeg-devel +BuildRequires: libtool >= 2:2.2 +BuildRequires: perl-devel >= 1:5.8.0 +BuildRequires: pkgconfig +BuildRequires: python-devel >= 2.3.5 +BuildRequires: python-pygtk-devel >= 2:2.0 +BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: rpmbuild(macros) >= 1.357 +BuildRequires: qt4-build >= 4 +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXv-devel +Requires: ImageMagick-libs >= 1:6.2.6 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +ZBar Bar Code Reader 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 EAN-13/UPC-A, UPC-E, EAN-8, Code 128, +Code 39, Interleaved 2 of 5 and QR Code. Included with the library are +basic applications for decoding captured bar code images and using a +video device (eg, webcam) as a bar code scanner. For application +developers, language bindings are available for C, C++, Python and +Perl as well as GUI widgets for Qt, GTK+ and PyGTK. + +%description -l pl.UTF-8 +ZBar Bar Code Reader to zestaw oprogramowania do odczytu kodów +paskowych z różnych źródeł, takich jak strumienie wideo, pliki +obrazów oraz czujniki jasności. Obsługuje kody EAN-13/UPC-A, UPC-E, +EAN-8, Code 128, Code 39, Interleaved 2 of 5 oraz QR Code. Do +biblioteki dołączone są podstawowe aplikacje do dekodowania wyłapanych +obrazów kodów paskowych oraz używania urządzeń wejściowych obrazu (np. +kamer internetowych) jako skanera kodów paskowych. Dla programistów są +dostępne też wiązania dla C, C++, Pythona, Perla oraz widgety GUI dla +Qt, GTK+ oraz PyGTK. + +%package devel +Summary: C and C++ header files for ZBar library +Summary(pl.UTF-8): Pliki nagłówkowe C i C++ dla biblioteki ZBar +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: libjpeg-devel +Requires: xorg-lib-libXext-devel +Requires: xorg-lib-libXv-devel + +%description devel +C and C++ header files for ZBar library. + +%description devel -l pl.UTF-8 +Pliki nagłówkowe C i C++ dla biblioteki ZBar. + +%package static +Summary: Static ZBar library +Summary(pl.UTF-8): Statyczna biblioteka ZBar +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static ZBar library. + +%description static -l pl.UTF-8 +Statyczna biblioteka ZBar. + +%package gtk +Summary: Bar code scanning and decoding GTK+ widget +Summary(pl.UTF-8): Widget GTK+ do skanowania i dekodowania kodów paskowych +Group: X11/Libraries +Requires: %{name} = %{version}-%{release} + +%description gtk +Bar code scanning and decoding GTK+ widget. + +%description gtk -l pl.UTF-8 +Widget GTK+ do skanowania i dekodowania kodów paskowych. + +%package gtk-devel +Summary: Header file for bar code scanning and decoding GTK+ widget +Summary(pl.UTF-8): Plik nagłówkowy widgetu GTK+ do skanowania i dekodowania kodów paskowych +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-gtk = %{version}-%{release} +Requires: gtk+2-devel >= 2.0 + +%description gtk-devel +Header file for bar code scanning and decoding GTK+ widget. + +%description gtk-devel -l pl.UTF-8 +Plik nagłówkowy widgetu GTK+ do skanowania i dekodowania kodów +paskowych. + +%package gtk-static +Summary: Bar code scanning and decoding GTK+ widget - static library +Summary(pl.UTF-8): Widget GTK+ do skanowania i dekodowania kodów paskowych - biblioteka statyczna +Group: X11/Development/Libraries +Requires: %{name}-gtk-devel = %{version}-%{release} + +%description gtk-static +Bar code scanning and decoding GTK+ widget - static library. + +%description gtk-static -l pl.UTF-8 +Widget GTK+ do skanowania i dekodowania kodów paskowych - biblioteka +statyczna. + +%package qt +Summary: Bar code scanning and decoding Qt4 widget +Summary(pl.UTF-8): Widget Qt4 do skanowania i dekodowania kodów paskowych +Group: X11/Libraries +Requires: %{name} = %{version}-%{release} + +%description qt +Bar code scanning and decoding Qt4 widget. + +%description qt -l pl.UTF-8 +Widget Qt4 do skanowania i dekodowania kodów paskowych. + +%package qt-devel +Summary: Header file for bar code scanning and decoding Qt4 widget +Summary(pl.UTF-8): Plik nagłówkowy widgetu Qt4 do skanowania i dekodowania kodów paskowych +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-qt = %{version}-%{release} +Requires: QtCore-devel >= 4 +Requires: QtGui-devel >= 4 + +%description qt-devel +Header file for bar code scanning and decoding Qt4 widget. + +%description qt-devel -l pl.UTF-8 +Plik nagłówkowy widgetu Qt4 do skanowania i dekodowania kodów +paskowych. + +%package qt-static +Summary: Bar code scanning and decoding Qt4 widget - static library +Summary(pl.UTF-8): Widget Qt4 do skanowania i dekodowania kodów paskowych - biblioteka statyczna +Group: X11/Development/Libraries +Requires: %{name}-qt-devel = %{version}-%{release} + +%description qt-static +Bar code scanning and decoding Qt4 widget - static library. + +%description qt-static -l pl.UTF-8 +Widget Qt4 do skanowania i dekodowania kodów paskowych - biblioteka +statyczna. + +%package -n perl-Barcode-ZBar +Summary: Perl interface to ZBar bar code reader +Summary(pl.UTF-8): Interfejs Perla do czytnika kodów paskowych ZBar +Group: Development/Languages/Perl +Requires: %{name} = %{version}-%{release} + +%description -n perl-Barcode-ZBar +Perl interface to ZBar bar code reader. + +%description -n perl-Barcode-ZBar -l pl.UTF-8 +Interfejs Perla do czytnika kodów paskowych ZBar. + +%package -n python-zbar +Summary: Python interface to ZBar bar code reader +Summary(pl.UTF-8): Interfejs Pythona do czytnika kodów paskowych ZBar +Group: Libraries/Python +Requires: %{name} = %{version}-%{release} +%pyrequires_eq python-libs + +%description -n python-zbar +Python interface to ZBar bar code reader. + +%description -n python-zbar -l pl.UTF-8 +Interfejs Pythona do czytnika kodów paskowych ZBar. + +%package -n python-zbar-pygtk +Summary: Bar code scanning and decoding PyGTK widget +Summary(pl.UTF-8): Widget PyGTK do skanowania i dekodowania kodów paskowych +Group: Libraries/Python +Requires: %{name}-gtk = %{version}-%{release} +Requires: python-pygtk-gtk >= 2:2.0 +%pyrequires_eq python-libs + +%description -n python-zbar-pygtk +Bar code scanning and decoding PyGTK widget. + +%description -n python-zbar-pygtk -l pl.UTF-8 +Widget PyGTK do skanowania i dekodowania kodów paskowych. + +%package -n browser-plugin-zbar +Summary: ZBar plugin for Web browsers +Summary(pl.UTF-8): Wtyczka ZBar dla przeglądarek WWW +Group: X11/Applications/Graphics +Requires: %{name} = %{version}-%{release} +Requires: browser-plugins >= 2.0 + +%description -n browser-plugin-zbar +ZBar plugin for Web browsers. + +%description -n browser-plugin-zbar -l pl.UTF-8 +Wtyczka ZBar dla przeglądarek WWW. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + %{?with_npapi:--with-npapi} +%{__make} + +TOPDIR=$(pwd) +cd perl +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor \ + INC="-I${TOPDIR}/include" \ + LIBS="-L${TOPDIR}/zbar/.libs -lzbar" + +%{__make} \ + CC="%{__cc}" \ + OPTIMIZE="%{rpmcflags}" + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la + +%{__make} -C perl install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Barcode/ZBar/*.pod +# not rm -r to ensure it's empty after .pod removal +rmdir $RPM_BUILD_ROOT%{perl_vendorarch}/Barcode/ZBar +%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Barcode/ZBar/.packlist +%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod + +%if %{with npapi} +install -d $RPM_BUILD_ROOT%{_browserpluginsdir} +mv $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so* $RPM_BUILD_ROOT%{_browserpluginsdir} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.{la,a} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%post gtk -p /sbin/ldconfig +%postun gtk -p /sbin/ldconfig + +%post qt -p /sbin/ldconfig +%postun qt -p /sbin/ldconfig + +%post -n browser-plugin-zbar +%update_browser_plugins + +%postun -n browser-plugin-zbar +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + +%files +%defattr(644,root,root,755) +# COPYING contains license summary, not LGPL text +%doc COPYING ChangeLog NEWS README TODO +%attr(755,root,root) %{_bindir}/zbarcam +%attr(755,root,root) %{_bindir}/zbarimg +%attr(755,root,root) %{_libdir}/libzbar.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libzbar.so.0 +%dir %{_datadir}/%{name} +%{_mandir}/man1/zbarcam.1* +%{_mandir}/man1/zbarimg.1* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libzbar.so +%{_libdir}/libzbar.la +# C +%{_includedir}/zbar.h +%dir %{_includedir}/zbar +# C++ +%{_includedir}/zbar/Decoder.h +%{_includedir}/zbar/Exception.h +%{_includedir}/zbar/Image.h +%{_includedir}/zbar/ImageScanner.h +%{_includedir}/zbar/Processor.h +%{_includedir}/zbar/Scanner.h +%{_includedir}/zbar/Symbol.h +%{_includedir}/zbar/Video.h +%{_includedir}/zbar/Window.h +%{_pkgconfigdir}/zbar.pc + +%files static +%defattr(644,root,root,755) +%{_libdir}/libzbar.a + +%files gtk +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libzbargtk.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libzbargtk.so.0 + +%files gtk-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libzbargtk.so +%{_libdir}/libzbargtk.la +%{_includedir}/zbar/zbargtk.h +%{_pkgconfigdir}/zbar-gtk.pc + +%files gtk-static +%defattr(644,root,root,755) +%{_libdir}/libzbargtk.a + +%files qt +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libzbarqt.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libzbarqt.so.0 + +%files qt-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libzbarqt.so +%{_libdir}/libzbarqt.la +%{_includedir}/zbar/QZBar.h +%{_includedir}/zbar/QZBarImage.h +%{_pkgconfigdir}/zbar-qt.pc + +%files qt-static +%defattr(644,root,root,755) +%{_libdir}/libzbarqt.a + +%files -n perl-Barcode-ZBar +%defattr(644,root,root,755) +%dir %{perl_vendorarch}/Barcode +%{perl_vendorarch}/Barcode/ZBar.pm +%dir %{perl_vendorarch}/auto/Barcode +%dir %{perl_vendorarch}/auto/Barcode/ZBar +%{perl_vendorarch}/auto/Barcode/ZBar/ZBar.bs +%attr(755,root,root) %{perl_vendorarch}/auto/Barcode/ZBar/ZBar.so +%{_mandir}/man3/Barcode::ZBar*.3pm* + +%files -n python-zbar +%defattr(644,root,root,755) +%attr(755,root,root) %{py_sitedir}/zbar.so + +%files -n python-zbar-pygtk +%defattr(644,root,root,755) +%attr(755,root,root) %{py_sitedir}/zbarpygtk.so + +%if %{with npapi} +%files -n browser-plugin-zbar +%defattr(644,root,root,755) +%attr(755,root,root) %{_browserpluginsdir}/libzbarplugin.so* +%endif + +%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) +%changelog +* %{date} PLD Team <[email protected]> +All persons listed below can be reached at <cvs_login>@pld-linux.org + +$Log$ +Revision 1.1 2010/12/31 13:44:26 qboosh +- new ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
