[PackageKit] (temporarily) build --disable-browser-plugin

Rex Dieter rdieter at fedoraproject.org
Tue Nov 15 16:58:06 UTC 2011


commit 25e444fa6eaded1f62a56de2005a983ae6f70cc0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 15 10:58:49 2011 -0600

    (temporarily) build --disable-browser-plugin

 PackageKit.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/PackageKit.spec b/PackageKit.spec
index 299d868..262eb2a 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,7 +3,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.20
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -38,7 +38,11 @@ BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: libgudev1-devel
+%if 0%{?fedora} < 17
 BuildRequires: xulrunner-devel
+%else
+%define _disable_browser_plugin --disable-browser-plugin
+%endif
 BuildRequires: libarchive-devel
 BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
@@ -263,7 +267,8 @@ user to restart the computer or remove and re-insert the device.
         --with-default-backend=yum,zif \
         --disable-local \
         --disable-strict \
-        --disable-tests
+        --disable-tests \
+	%{?_disable_browser_plugin}
 
 make %{?_smp_mflags}
 
@@ -404,9 +409,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_bindir}/pk-debuginfo-install
 %{_datadir}/man/man1/pk-debuginfo-install.1.gz
 
+%if ! 0%{?_disable_browser_plugin:1}
 %files browser-plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/packagekit-plugin.so
+%endif
 
 %files gstreamer-plugin
 %defattr(-,root,root,-)
@@ -463,6 +470,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Tue Nov 15 2011 Rex Dieter <rdieter at fedoraproject.org> 0.6.20-2
+- (temporarily) build --disable-browser-plugin
+
 * Mon Nov 07 2011 Richard Hughes  <rhughes at redhat.com> - 0.6.20-1
 - New upstream release.
 - Remove upstreamed patches


More information about the scm-commits mailing list