packages: xulrunner/xulrunner-install.patch, xulrunner/xulrunner.spec - up ...

[arekm]

Author: arekm                        Date: Wed Jun 22 20:35:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0; builds but untested

---- Files affected:
packages/xulrunner:
   xulrunner-install.patch (1.10 -> 1.11) , xulrunner.spec (1.182 -> 1.183) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.10 packages/xulrunner/xulrunner-install.patch:1.11
--- packages/xulrunner/xulrunner-install.patch:1.10	Wed Mar 23 18:21:32 2011
+++ packages/xulrunner/xulrunner-install.patch	Wed Jun 22 22:35:22 2011
@@ -11,7 +11,7 @@
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  # STAGEPATH
  ifdef MOZ_PKG_MANIFEST
- 	$(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
+ 	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
  	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.182 packages/xulrunner/xulrunner.spec:1.183
--- packages/xulrunner/xulrunner.spec:1.182	Mon May  2 22:36:18 2011
+++ packages/xulrunner/xulrunner.spec	Wed Jun 22 22:35:22 2011
@@ -14,9 +14,9 @@
 # https://www.mozilla.org/security/known-vulnerabilities/firefox36.html#firefox3.6.14
 
 # convert firefox release number to platform version: 4.0.x -> 2.0.x
-%define		xulrunner_main	2.0
-%define		firefox_ver	4.0.1
-%define		xulrunner_ver	%(v=%{firefox_ver}; echo %{xulrunner_main}${v#4.0})
+%define		xulrunner_main	5.0
+%define		firefox_ver	5.0
+%define		xulrunner_ver	%(v=%{firefox_ver}; echo %{xulrunner_main}${v#5.0})
 
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -25,14 +25,14 @@
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	%{xulrunner_ver}
-Release:	2
+Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{firefox_ver}/source/firefox-%{firefox_ver}.source.tar.bz2
-# Source0-md5:	9abda7d23151e97913c8555a64c13f34
+# Source0-md5:	9f64a01e86a5d424e12a8e3305c5debe
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch3:		%{name}-gcc3.patch
@@ -169,7 +169,7 @@
 
 %prep
 %setup -qc
-mv -f mozilla-%{xulrunner_main} mozilla
+mv -f mozilla-release mozilla
 cd mozilla
 # avoid using included headers (-I. is before HUNSPELL_CFLAGS)
 %{__rm} extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
@@ -318,9 +318,6 @@
 %{__make} -C obj-%{_target_cpu}/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
@@ -348,9 +345,6 @@
 %attr(755,root,root) %{_bindir}/xulrunner
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin
 
-%dir %{_sysconfdir}/gre.d
-%{_sysconfdir}/gre.d/%{version}.conf
-
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
@@ -450,7 +444,6 @@
 %{_libdir}/%{name}/components/webBrowser_core.xpt
 %{_libdir}/%{name}/components/webapps.xpt
 %{_libdir}/%{name}/components/webbrowserpersist.xpt
-%{_libdir}/%{name}/components/webshell_idls.xpt
 %{_libdir}/%{name}/components/widget.xpt
 %{_libdir}/%{name}/components/windowds.xpt
 %{_libdir}/%{name}/components/windowwatcher.xpt
@@ -594,6 +587,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2011/06/22 20:35:22  arekm
+- up to 5.0; builds but untested
+
 Revision 1.182  2011/05/02 20:36:18  megabajt
 - the problem with session save / restore was in iceweasel
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.182&r2=1.183&f=u