packages: xulrunner/xulrunner.spec - platform.ini needs to be present when ...

[glen]

Author: glen                         Date: Thu Sep 10 10:30:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- platform.ini needs to be present when iceweasel is built with xulrunner, move it to -libs
- act like --register-global was ran, no need to actually run it
- rel 2

---- Files affected:
packages/xulrunner:
   xulrunner.spec (1.111 -> 1.112) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.111 packages/xulrunner/xulrunner.spec:1.112
--- packages/xulrunner/xulrunner.spec:1.111	Wed Sep  9 22:06:14 2009
+++ packages/xulrunner/xulrunner.spec	Thu Sep 10 12:30:45 2009
@@ -6,14 +6,13 @@
 %bcond_without	kerberos	# disable krb5 support
 %bcond_with	mozldap		# build with system mozldap
 %bcond_with	qt			# build with qt toolkit
-#
-%define		rel	1
+
 %define		firefox_ver	3.5.3
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	1.9.1.3
-Release:	%{rel}
+Release:	2
 Epoch:		1
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
@@ -303,12 +302,12 @@
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_libdir}/%{name}
 
-# created by --register-glibal
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gre.d/%{version}.conf
-
 %{__make} -C build/unix install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# act like xulrunner --register-global was run
+mv $RPM_BUILD_ROOT/etc/gre.d/%{version}{.system,}.conf
+
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
 # remove unecessary stuff
@@ -323,13 +322,11 @@
 %post
 %update_browser_plugins
 umask 022
-xulrunner --register-global
 
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 	umask 022
-	xulrunner --unregister-global
 fi
 
 %post	libs -p /sbin/ldconfig
@@ -360,8 +357,6 @@
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/components
 
-%{_libdir}/%{name}/platform.ini
-
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
@@ -499,6 +494,7 @@
 %files libs
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/platform.ini
 %attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
 %attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
@@ -541,6 +537,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2009/09/10 10:30:45  glen
+- platform.ini needs to be present when iceweasel is built with xulrunner, move it to -libs
+- act like --register-global was ran, no need to actually run it
+- rel 2
+
 Revision 1.111  2009/09/09 20:06:14  arekm
 - up to 1.9.1.3
 
@@ -583,7 +584,7 @@
 - updated to 1.9.1 based on Firefox 3.5 (merged from DEVEL)
 
 Revision 1.99  2009/06/14 07:06:59  arekm
-up to 1.9.0.11
+- up to 1.9.0.11
 
 Revision 1.98  2009/04/29 22:15:19  duddits
 - rel. 2, %files were broken
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.111&r2=1.112&f=u