SPECS: xulrunner.spec - as long system nss is not used the nss library deps...

[glen]

Author: glen                         Date: Wed Jun 18 20:37:31 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- as long system nss is not used the nss library deps should not be provided nor required outside (some applies to firefox3 package)

---- Files affected:
SPECS:
   xulrunner.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.56 SPECS/xulrunner.spec:1.57
--- SPECS/xulrunner.spec:1.56	Wed Jun 18 22:28:36 2008
+++ SPECS/xulrunner.spec	Wed Jun 18 22:37:26 2008
@@ -7,15 +7,17 @@
 #   - even if platform.ini is found and parsed test application doesn't work
 #     eihter some files are missing or again xulrunner looks for theme in
 #     wrong paths, check & debug & fix it somehow
+#   - use system nss
 #
 # Conditional build:
 %bcond_with	tests		# enable tests (whatever they check)
 %bcond_without	gnome		# disable all GNOME components (gnomevfs, gnome, gnomeui)
 %bcond_without	kerberos	# disable krb5 support
 %bcond_with	mozldap		# build with system mozldap
+%bcond_with	system_nss		# use system nss
 #
 
-%define		rel    0.3
+%define		rel    0.4
 %define		subver    20080618
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
@@ -56,7 +58,7 @@
 BuildRequires:	libstdc++-devel
 %{?with_mozldap:BuildRequires:	mozldap-devel >= 6.0}
 BuildRequires:	nspr-devel >= 1:4.6.4
-BuildRequires:	nss-devel >= 1:3.11.3-3
+%{?with_system_nss:BuildRequires:	nss-devel >= 1:3.11.3-3}
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
@@ -74,15 +76,21 @@
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	browser-plugins >= 2.0
 Requires:	nspr >= 1:4.6.4
-Requires:	nss >= 1:3.11.3
+%{?with_system_nss:Requires:	nss >= 1:3.11.3}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
 
-# we don't want these to satisfy xulrunner-devel [???]
-%define		_noautoprov	libmozjs.so libxpcom.so
+%if %{without system_nss}
+%define		nssdeps	libfreebl3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libsqlite3.so libssl3.so
+%else
+%define		nssdeps %{nil}
+%endif
+
+# we don't want these to satisfy other mozilla.org products -devel
+%define		_noautoprov	libmozjs.so libxpcom.so %{nssdeps}
 # no need to require them (we have strict deps for these)
-%define		_noautoreq	libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
+%define		_noautoreq	libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so %{nssdeps}
 
 %description
 XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -117,7 +125,7 @@
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	nspr-devel >= 1:4.6.4
-Requires:	nss-devel >= 1:3.11.3
+%{?with_system_nssl:Requires:	nss-devel >= 1:3.11.3}
 Obsoletes:	mozilla-devel
 Obsoletes:	mozilla-firefox-devel
 Obsoletes:	seamonkey-devel
@@ -334,7 +342,7 @@
 
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 
-# TODO system nss!
+%if %{without system_nss}
 %{_libdir}/%{name}/libfreebl3.chk
 %{_libdir}/%{name}/libsoftokn3.chk
 %attr(755,root,root) %{_libdir}/%{name}/libfreebl3.so
@@ -346,6 +354,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/libsoftokn3.so
 %attr(755,root,root) %{_libdir}/%{name}/libsqlite3.so
 %attr(755,root,root) %{_libdir}/%{name}/libssl3.so
+%endif
 
 %attr(755,root,root) %{_libdir}/%{name}/libjemalloc.so
 
@@ -507,6 +516,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2008/06/18 20:37:26  glen
+- as long system nss is not used the nss library deps should not be provided nor required outside (some applies to firefox3 package)
+
 Revision 1.56  2008/06/18 20:28:36  glen
 - damn need to resolve the controller caching issues here in toothy (10024380 ahci ATI Technologies Inc|SB600 Non-Raid-5 SATA)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.56&r2=1.57&f=u