rpms/xulrunner/OLPC-3 sources, 1.50, 1.51 xulrunner-mozconfig, 1.21, 1.22 xulrunner-redhat-default-prefs.js, 1.2, 1.3 xulrunner.spec, 1.127, 1.128 import.log, 1.1, NONE mozilla-keys.patch, 1.1, NONE mozilla-resolution.patch, 1.1, NONE mozilla-wtfbuttons.patch, 1.1, NONE

Fri Jun 20 12:19:33 UTC 2008

Author: mpg

Update of /cvs/pkgs/rpms/xulrunner/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28173

Modified Files:
	sources xulrunner-mozconfig xulrunner-redhat-default-prefs.js 
	xulrunner.spec 
Removed Files:
	import.log mozilla-keys.patch mozilla-resolution.patch 
	mozilla-wtfbuttons.patch 
Log Message:
resync with F9, cleanup pyxpcom packaging


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51

--- sources	31 Mar 2008 23:28:12 -0000	1.50
+++ sources	20 Jun 2008 12:18:07 -0000	1.51
@@ -1 +1 @@
-cbb83017ed3c0e740a9128089a4f1b2d  xulrunner-1.9b5-source.tar.bz2
+b514375509fd439e44def1e4a7873af4  xulrunner-1.9-source.tar.bz2


Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner-mozconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xulrunner-mozconfig	12 Jun 2008 20:51:37 -0000	1.21
+++ xulrunner-mozconfig	20 Jun 2008 12:18:07 -0000	1.22
@@ -15,6 +15,7 @@
 ac_add_options --with-pthreads
 ac_add_options --disable-strip
 ac_add_options --disable-tests
+#ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
@@ -23,6 +24,7 @@
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-javaxpcom
+ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --enable-safe-browsing
 ac_add_options --enable-extensions=default,python/xpcom


Index: xulrunner-redhat-default-prefs.js
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner-redhat-default-prefs.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-redhat-default-prefs.js	13 Jan 2008 23:57:38 -0000	1.2
+++ xulrunner-redhat-default-prefs.js	20 Jun 2008 12:18:07 -0000	1.3
@@ -6,3 +6,4 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");
 pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- xulrunner.spec	12 Jun 2008 20:51:37 -0000	1.127
+++ xulrunner.spec	20 Jun 2008 12:18:07 -0000	1.128
@@ -2,19 +2,17 @@
 %define nss_version 3.11.99.5
 %define cairo_version 0.5
 
-%define version_internal  1.9pre
+%define version_internal  1.9
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
-%define version_pre .beta5
-
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.61%{?version_pre}%{?dist}
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-1.9b5-source.tar.bz2
+Source0:        xulrunner-1.9-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -23,17 +21,15 @@
 # build patches
 Patch1:         mozilla-build.patch
 Patch2:         xulrunner-path.patch
-Patch3:         xulrunner-version.patch
+Patch4:         mozilla-sqlite.patch
+Patch5:         mozilla-mochitest.patch
 
 # Fedora specific patches
 Patch10:        mozilla-pkgconfig.patch
 
 # Upstream patches
-Patch20:        mozilla-dpi.patch
-Patch21:        mozilla-wtfbuttons.patch
-Patch22:        mozilla-keys.patch
-Patch23:        xulrunner-hang.patch
-Patch24:        mozilla-resolution.patch
+Patch26:        mozilla-ps-pdf-simplify-operators.patch
+Patch27:        mozilla-ssl-exception.patch
 
 
 # ---------------------------------------------------
@@ -59,6 +55,9 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= 3.5
+BuildRequires:  startup-notification-devel
+# For -sqlite.patch
+BuildRequires:  autoconf213
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
@@ -91,32 +90,39 @@
 Unstable files for use with development of Gecko applications.  These headers
 are not frozen and APIs can change at any time, so should not be relied on.
 
-%package pyxpcom
+%package -n python-xulrunner
 Summary: PyXPCOM bindings.
 Group: Development/Libraries
-BuildRequires:  python-devel
+BuildRequires: python-devel
 
-%description pyxpcom
+%description -n python-xulrunner
 PyXPCOM allows for bidirectional communication between Python and XPCOM which
 permits both extension of XPCOM components from Python and embedding of XPCOM
 components into Python applications.
 
+%package -n python-xulrunner-devel
+Summary: Development files for PyXPCOM.
+Group: Development/Libraries
+Requires: xulrunner-devel
+
+%description -n python-xulrunner-devel
+PyXPCOM development files.
+
 #---------------------------------------------------------------------
 
 %prep
 %setup -q -c
 cd mozilla
-%patch1  -p1
-%patch2  -p1
-%patch3  -p1 -b .ver
+%patch1  -p1 -b .build
+%patch2  -p1 -b .path
+%patch4  -p1 -b .sqlite
+autoconf-2.13
+%patch5  -p1 -b .mochitest
 
 %patch10 -p1 -b .pk
 
-%patch20 -p1 -b .dpi
-%patch21 -p1 -b .wtfbuttons
-%patch22 -p1 -b .keys
-%patch23 -p1 -b .hang
-%patch24 -p1 -b .resolution
+%patch26 -p1 -b .ps-pdf-simplify-operators
+%patch27 -p1 -b .ssl-exception
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -344,7 +350,6 @@
 %{mozappdir}/plugins
 %{mozappdir}/res
 %{mozappdir}/*.so
-%exclude %{mozappdir}/libpyxpcom.so
 %{mozappdir}/mozilla-xremote-client
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/regxpcom
@@ -363,6 +368,7 @@
 %dir %{_datadir}/idl/%{name}*%{version_internal}
 %{_datadir}/idl/%{name}*%{version_internal}/stable
 %{_includedir}/%{name}*%{version_internal}
+%exclude %{_includedir}/%{name}*%{version_internal}/pyxpcom
 %exclude %{_includedir}/%{name}*%{version_internal}/unstable
 %dir %{_libdir}/%{name}-sdk-*
 %dir %{_libdir}/%{name}-sdk-*/sdk
@@ -387,24 +393,37 @@
 %{_libdir}/pkgconfig/*unstable*.pc
 %{_libdir}/pkgconfig/*gtkmozembed*.pc
 
-%files pyxpcom
+%files -n python-xulrunner
 %defattr(-,root,root,-)
-# %dir %{mozappdir}/python/xpcom   -- We actually only want python/xpcom, since
-# python/dom might be a pydom subpackage itself; however, somebody has to own
-# python/ and that's us for the moment.
 %dir %{mozappdir}/python
 %{mozappdir}/python/*
 %{mozappdir}/components/py*
 %{mozappdir}/libpyxpcom.so
 
+%files -n python-xulrunner-devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}*%{version_internal}/pyxpcom
 
 #---------------------------------------------------------------------
 
 %changelog
-* Mon May 05 2008 Michael Stone <michael at laptop.org> 1.0-0.61
-- Enable PyXPCOM and include it in a -pyxpcom subpackage.
+* Fri Jun 20 2008 Marco Pesenti Gritti <mpg at redhat.com> 1.9-2
+- Add python-xulrunner and python-xulrunner-devel
+
+* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 1.9-1
+- Update to 1.9 final
+
+* Thu May 29 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
+- Simplify PS/PDF operators
+
+* Thu May 22 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.62
+- Upstream patch to fsync() less
+
+* Thu May 08 2008 Colin Walters <walters at redhat.com> 1.9-0.61
+- Ensure we enable startup notification; add BR and modify config
+  (bug #445543)
 
-* Wed Apr 30 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.60
+* Wed Apr 30 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.60
 - Some files moved to mozilla-filesystem; kill them and add the Req
 
 * Mon Apr 28 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.59


--- import.log DELETED ---


--- mozilla-keys.patch DELETED ---


--- mozilla-resolution.patch DELETED ---


--- mozilla-wtfbuttons.patch DELETED ---


