Author: hawk Date: Sun Sep 20 00:19:53 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- don't touch /etc/gre.d/*.conf in Titanium, this file must exist for
XPCOM applications to work correctly (fixes Epiphany build error)
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.113 -> 1.114)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.113
packages/xulrunner/xulrunner.spec:1.114
--- packages/xulrunner/xulrunner.spec:1.113 Thu Sep 10 12:37:32 2009
+++ packages/xulrunner/xulrunner.spec Sun Sep 20 02:19:47 2009
@@ -12,7 +12,7 @@
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla
aplikacji XUL+XPCOM
Name: xulrunner
Version: 1.9.1.3
-Release: 3
+Release: 4
Epoch: 1
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
@@ -305,8 +305,10 @@
%{__make} -C build/unix install \
DESTDIR=$RPM_BUILD_ROOT
+%if "%{pld_release}" != "ti"
# act like xulrunner --register-global was run
mv $RPM_BUILD_ROOT/etc/gre.d/%{version}{.system,}.conf
+%endif
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
@@ -335,10 +337,14 @@
%attr(755,root,root) %{_bindir}/xulrunner
%attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin
+%if "%{pld_release}" == "ti"
+%{_sysconfdir}/gre.d
+%else
%dir %{_sysconfdir}/gre.d
%{_sysconfdir}/gre.d
%ghost %{_sysconfdir}/gre.d/%{version}.conf
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/gre.d/%{version}.conf
+%endif
# symlinks
%{_libdir}/%{name}/chrome
@@ -535,6 +541,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.114 2009/09/20 00:19:47 hawk
+- don't touch /etc/gre.d/*.conf in Titanium, this file must exist for
+ XPCOM applications to work correctly (fixes Epiphany build error)
+
Revision 1.113 2009/09/10 10:37:32 glen
- cleanup; files fix; rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.113&r2=1.114&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
