[libproxy] Update to libproxy bootstrap special case

Nicolas Chauvet kwizart at fedoraproject.org
Mon Sep 6 15:27:34 UTC 2010


commit 9970be7bb75c64ae50a6488e36491f6e3e97df7d
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Sep 6 17:28:33 2010 +0200

    Update to libproxy bootstrap special case

 libproxy.spec |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/libproxy.spec b/libproxy.spec
index 4106365..6ac0a1c 100644
--- a/libproxy.spec
+++ b/libproxy.spec
@@ -1,9 +1,17 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global gecko_version 1.9.2
+#0 to bootstrap libproxy circle dependencies - 1 normal case
+%if 0
 %if 0%{?fedora} < 15
+%global gecko_version 1.9.2
 %global _with_mozjs 1
 %endif
+%global _with_gnome 1
+%global _with_kde 1
+%global _with_networkmanager 1
+%global _with_python 1
+%global _with_webkit 1
+%endif
 
 Name:           libproxy
 Version:        0.4.5
@@ -16,22 +24,26 @@ URL:            http://code.google.com/p/libproxy/
 Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
-BuildRequires:  libmodman-devel
+%{?_with_python:BuildRequires:  python-devel}
+BuildRequires:  libmodman-devel >= 2.0.0
 BuildRequires:  cmake >= 2.6.0
 
 # gnome
+%{?_with_gnome:
 BuildRequires:  GConf2-devel
 BuildRequires:  libXmu-devel
+}
 # mozjs
 %{?_with_mozjs:BuildRequires:  gecko-devel}
 # NetworkManager
+%{?_with_networkmanager:
 BuildRequires:  NetworkManager-devel
 BuildRequires:  dbus-devel
+}
 # webkit (gtk)
-BuildRequires:  WebKit-gtk-devel
+%{?_with_webkit:BuildRequires:  WebKit-gtk-devel}
 # kde
-BuildRequires:  kdelibs-devel
+%{?_with_kde:BuildRequires:  kdelibs-devel}
 
 
 %description
@@ -54,6 +66,7 @@ Requires:       %{name} = %{version}-%{release}
 %description    bin
 The %{name}-bin package contains the proxy binary for %{name}
 
+%{?_with_python:
 %package        python
 Summary:        Binding for %{name} and python
 Group:          System Environment/Libraries
@@ -62,7 +75,9 @@ BuildArch:      noarch
 
 %description    python
 The %{name}-python package contains the python binding for %{name}
+}
 
+%{?_with_gnome:
 %package        gnome
 Summary:        Plugin for %{name} and gnome
 Group:          System Environment/Libraries
@@ -70,7 +85,9 @@ Requires:       %{name} = %{version}-%{release}
 
 %description    gnome
 The %{name}-gnome package contains the %{name} plugin for gnome.
+}
 
+%{?_with_kde:
 %package        kde
 Summary:        Plugin for %{name} and kde
 Group:          System Environment/Libraries
@@ -78,6 +95,7 @@ Requires:       %{name} = %{version}-%{release}
 
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
+}
 
 %{?_with_mozjs:
 %package        mozjs
@@ -92,6 +110,7 @@ Provides:       %{name}-pac = %{version}-%{release}
 The %{name}-mozjs package contains the %{name} plugin for mozjs.
 }
 
+%{?_with_networkmanager:
 %package        networkmanager
 Summary:        Plugin for %{name} and networkmanager
 Group:          System Environment/Libraries
@@ -100,7 +119,9 @@ Requires:       %{name} = %{version}
 %description    networkmanager
 The %{name}-networkmanager package contains the %{name} plugin
 for networkmanager.
+}
 
+%{?_with_webkit:
 %package        webkit
 Summary:        Plugin for %{name} and webkit
 Group:          System Environment/Libraries
@@ -110,6 +131,7 @@ Provides:       %{name}-pac = %{version}-%{release}
 %description    webkit
 The %{name}-webkit package contains the %{name} plugin for
 webkit.
+}
 
 %package        devel
 Summary:        Development files for %{name}
@@ -159,18 +181,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/proxy
 
+%{?_with_python:
 %files python
 %defattr(-,root,root,-)
 %{python_sitelib}/*
+}
 
+%{?_with_gnome:
 %files gnome
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/config_gnome.so
 %{_libexecdir}/pxgconf
+}
 
+%{?_with_kde:
 %files kde
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/config_kde4.so
+}
 
 %{?_with_mozjs:
 %files mozjs
@@ -178,13 +206,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/%{version}/modules/pacrunner_mozjs.so
 }
 
+%{?_with_networkmanager:
 %files networkmanager
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/network_networkmanager.so
+}
 
+%{?_with_webkit:
 %files webkit
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/modules/pacrunner_webkit.so
+}
 
 %files devel
 %defattr(-,root,root,-)
@@ -198,6 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Sep  6 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.4.5-1
 - Update to 0.4.5
 - Disable mozjs on fedora >= 15
+- Add libproxy bootstrap option to disable modules.
 
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.4.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild


More information about the scm-commits mailing list