diff --git a/zbar.spec b/zbar.spec index e88a1ac..571c7d9 100644 --- a/zbar.spec +++ b/zbar.spec @@ -13,7 +13,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Patch0: zbar_update_to_hg.patch Patch1: zbar_use_libv4l.patch Patch2: zbar_choose_supported_format_first.patch -Patch3: zbar_fix_npapi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool python-devel gettext-devel @@ -82,23 +81,15 @@ This package contains header files and additional libraries used for developing GUI applications based on Qt4 that include a bar code scanning widget. -%package plugin -Group: Applications/Internet -Summary: Mozilla plugin for zbar - -%description plugin -This package contains zbar plugin for mozilla Firefox - %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build autoreconf -vfi -%configure --with-graphicsmagick --with-npapi --docdir=%{_docdir}/%{name}-%{version} +%configure --with-graphicsmagick --docdir=%{_docdir}/%{name}-%{version} # rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -109,9 +100,6 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/ -mv $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/ -rm $RPM_BUILD_ROOT%{_libdir}/libzbarplugin.so.* #Remove .la and .a files find ${RPM_BUILD_ROOT} -name '*.la' -or -name '*.a' | xargs rm -f @@ -187,14 +175,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/zbar-qt.pc %{_includedir}/zbar/QZBar*.h -%files plugin -%{_libdir}/mozilla/plugins/libzbarplugin.so - %changelog * Fri Feb 22 2013 Mauro Carvalho Chehab - 0.10-16 -- Enable firefox/mozilla plugin - -* Fri Feb 22 2013 Mauro Carvalho Chehab - Change zbar to use GraphicsMagick instead of ImageMagick * Fri Feb 22 2013 Mauro Carvalho Chehab - 0.10-15 diff --git a/zbar_fix_npapi.patch b/zbar_fix_npapi.patch deleted file mode 100644 index 521da07..0000000 --- a/zbar_fix_npapi.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r cd6dc43fd063 configure.ac ---- a/configure.ac Fri Feb 22 13:36:53 2013 -0300 -+++ b/configure.ac Fri Feb 22 20:41:40 2013 -0300 -@@ -400,9 +400,9 @@ - [with_npapi="no"]) - - AS_IF([test "x$with_npapi" != "xno"], -- [PKG_CHECK_MODULES([NPAPI], [firefox-plugin]) -- NPAPI_VERSION=`$PKG_CONFIG firefox-plugin --modversion` -- AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])]) -+ [PKG_CHECK_MODULES([NPAPI], [mozilla-plugin]) -+ NPAPI_VERSION=`$PKG_CONFIG mozilla-plugin --modversion` -+ AC_MSG_NOTICE([using mozilla-plugin version $NPAPI_VERSION])]) - - AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"]) - -diff -r cd6dc43fd063 plugin/Makefile.am.inc ---- a/plugin/Makefile.am.inc Fri Feb 22 13:36:53 2013 -0300 -+++ b/plugin/Makefile.am.inc Fri Feb 22 20:41:40 2013 -0300 -@@ -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)