packages: libproxy/libproxy.spec - added xulrunner conditional build

wrobell wrobell at pld-linux.org
Fri Oct 15 03:12:49 CEST 2010


Author: wrobell                      Date: Fri Oct 15 01:12:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added xulrunner conditional build

---- Files affected:
packages/libproxy:
   libproxy.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/libproxy/libproxy.spec
diff -u packages/libproxy/libproxy.spec:1.9 packages/libproxy/libproxy.spec:1.10
--- packages/libproxy/libproxy.spec:1.9	Sun Oct 10 20:59:40 2010
+++ packages/libproxy/libproxy.spec	Fri Oct 15 03:12:43 2010
@@ -1,7 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	webkit	# WebKit plugin
+%bcond_without	webkit	    # WebKit plugin
+%bcond_without	xulrunner   # xulrunner plugin
 #
 Summary:	Library for automatic proxy configuration management
 Summary(pl.UTF-8):	Biblioteka do automatycznego zarządzania konfiguracją proxy
@@ -28,7 +29,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXmu-devel
-BuildRequires:	xulrunner-devel
+%{?with_xulrunner:BuildRequires:	xulrunner-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -145,7 +146,8 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	%{!?with_webkit:--without-webkit}
+	%{!?with_webkit:--without-webkit} \
+	%{!?with_xulrunner:--without-xulrunner}
 %{__make}
 
 %install
@@ -203,9 +205,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/kde.so
 
+%if %{with xulrunner}
 %files mozjs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/plugins/mozjs.so
+%endif
 
 %if %{with webkit}
 %files webkit
@@ -219,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/10/15 01:12:43  wrobell
+- added xulrunner conditional build
+
 Revision 1.9  2010/10/10 18:59:40  qboosh
 - separated networkmanager plugin
 - added webkit bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libproxy/libproxy.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list