diff --git a/PackageKit-0.7.4-xulrunner2.patch b/PackageKit-0.7.4-xulrunner2.patch new file mode 100644 index 0000000..fb86fc6 --- /dev/null +++ b/PackageKit-0.7.4-xulrunner2.patch @@ -0,0 +1,12 @@ +diff -up PackageKit-0.7.4/configure.ac.xulrunner2 PackageKit-0.7.4/configure.ac +--- PackageKit-0.7.4/configure.ac.xulrunner2 2012-04-24 03:27:24.000000000 -0500 ++++ PackageKit-0.7.4/configure.ac 2012-05-25 09:15:04.170891611 -0500 +@@ -349,7 +349,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_ST + enable_browser_plugin=$enableval,enable_browser_plugin=yes) + if test x$enable_browser_plugin = xyes; then + PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \ +- mozilla-plugin >= 8.0 \ ++ mozilla-plugin >= 2 \ + gio-unix-2.0 \ + nspr >= 4.8 \ + cairo \ diff --git a/PackageKit.spec b/PackageKit.spec index 60ac503..11c19bb 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,7 +3,7 @@ Summary: Package management service Name: PackageKit Version: 0.7.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -20,6 +20,9 @@ Patch2: PackageKit-0.7.4-yum-untrusted.patch # Upstreamed: fix an obvious off-by-one when parsing the signature Patch3: 0001-Fix-importing-GPG-signatures.patch +# Upstreamable? allow use of xulrunner2 for browser-plugin support +Patch4: PackageKit-0.7.4-xulrunner2.patch + Requires: PackageKit-glib = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info @@ -28,6 +31,8 @@ Requires: comps-extras Requires: preupgrade %endif +# required by patch4 +BuildRequires: automake libtool BuildRequires: glib2-devel >= 2.16.1 BuildRequires: dbus-devel >= 1.1.1 BuildRequires: dbus-glib-devel >= 0.74 @@ -254,6 +259,8 @@ user to restart the computer or remove and re-insert the device. %patch1 -p1 -b .no-time %patch2 -p1 -b .yum-untrusted %patch3 -p1 -b .fix-install-signature +%patch4 -p1 -b .xulrunner2 +NOCONFIGURE=1 ./autogen.sh %build %configure \ @@ -269,7 +276,7 @@ user to restart the computer or remove and re-insert the device. --disable-strict \ --disable-tests -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT @@ -407,8 +414,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files browser-plugin %defattr(-,root,root,-) -#%{_libdir}/mozilla/plugins/packagekit-plugin.so -# FIXME: F17 doesn't have a new enough npapi package +%{_libdir}/mozilla/plugins/packagekit-plugin.so %files gstreamer-plugin %defattr(-,root,root,-) @@ -458,6 +464,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Fri May 25 2012 Rex Dieter 0.7.4-5 +- re-enable -browser-plugin content +- make V=1 + * Thu May 17 2012 Richard Hughes - 0.7.4-4 - Fix an obvious off-by-one when parsing the signature - Resolves: #794927