rpms/xulrunner/devel .cvsignore, 1.65, 1.66 mozilla-build.patch, 1.1, 1.2 sources, 1.68, 1.69 xulrunner.spec, 1.151, 1.152 mozilla-sqlite.patch, 1.5, NONE

[Christopher Aillon]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16201

Modified Files:
	.cvsignore mozilla-build.patch sources xulrunner.spec 
Removed Files:
	mozilla-sqlite.patch 
Log Message:
* Fri Mar 13 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.10
- 1.9.1 beta 3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore	21 Dec 2008 22:29:12 -0000	1.65
+++ .cvsignore	13 Mar 2009 23:35:53 -0000	1.66
@@ -1 +1 @@
-xulrunner-1.9.1b2-source.tar.bz2
+xulrunner-1.9.1b3-source.tar.bz2

mozilla-build.patch:

Index: mozilla-build.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-build.patch	6 Nov 2007 10:12:06 -0000	1.1
+++ mozilla-build.patch	13 Mar 2009 23:35:53 -0000	1.2
@@ -1,14 +1,14 @@
 diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
 --- mozilla/security/manager/Makefile.in.old	2007-10-25 00:25:30.000000000 +0200
 +++ mozilla/security/manager/Makefile.in	2007-11-06 10:57:39.000000000 +0100
-@@ -150,7 +150,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
  DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
  DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
  DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 -DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
- ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
- ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
- DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
+ ifdef NSS_DISABLE_DBM 
+ DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
+ endif
 diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
 --- mozilla/security/manager/ssl/src/Makefile.in.old	2007-10-19 21:16:36.000000000 +0200
 +++ mozilla/security/manager/ssl/src/Makefile.in	2007-11-06 10:57:52.000000000 +0100


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	21 Dec 2008 22:29:13 -0000	1.68
+++ sources	13 Mar 2009 23:35:53 -0000	1.69
@@ -1 +1 @@
-961168576de81960630013f22f3e61c0  xulrunner-1.9.1b2-source.tar.bz2
+61cd1a7fc587f6d2a33c564033198e2c  xulrunner-1.9.1b3-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- xulrunner.spec	27 Feb 2009 16:21:30 -0000	1.151
+++ xulrunner.spec	13 Mar 2009 23:35:53 -0000	1.152
@@ -3,7 +3,8 @@
 %define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
-%define sqlite_version 3.5
+%define sqlite_version 3.6.7
+%define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
@@ -11,11 +12,11 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.9.beta2%{?dist}
+Release:        0.10.beta3%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}b2-source.tar.bz2
+Source0:        xulrunner-%{version}b3-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -25,10 +26,9 @@
 Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch2:         mozilla-191-path.patch
-Patch3:         mozilla-sqlite.patch
-Patch4:         mozilla-jemalloc.patch
-Patch5:         xulrunner-pango.patch
-Patch6:         xulrunner-elif.patch
+Patch3:         mozilla-jemalloc.patch
+Patch4:         xulrunner-pango.patch
+Patch5:         xulrunner-elif.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
@@ -64,8 +64,6 @@
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
-# For -sqlite.patch
-BuildRequires:  autoconf213
 
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
@@ -144,7 +142,7 @@
 
 %prep
 %setup -q -c
-cd mozilla-central
+cd %{tarballdir}
 
 sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
     > version.patch
@@ -152,11 +150,9 @@
 
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
-%patch3  -p1 -b .sqlite
-autoconf-2.13
-%patch4 -p1 -b .jemalloc
-%patch5 -p1 -b .pango
-%patch6 -p1 -b .elif
+%patch3  -p1 -b .jemalloc
+%patch4  -p1 -b .pango
+%patch5  -p1 -b .elif
 
 %patch10 -p1 -b .pk
 
@@ -169,7 +165,7 @@
 #---------------------------------------------------------------------
 
 %build
-cd mozilla-central
+cd %{tarballdir}
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
@@ -196,7 +192,7 @@
 #---------------------------------------------------------------------
 
 %install
-cd mozilla-central
+cd %{tarballdir}
 %{__rm} -rf $RPM_BUILD_ROOT
 
 INTERNAL_GECKO=%{version_internal}
@@ -455,6 +451,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Mar 13 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.10
+- 1.9.1 beta 3
+
 * Fri Feb 27 2009 Martin Stransky <stransky at redhat.com> 1.9.1-0.9
 - Build fix for pango 1.23
 - Misc. build fixes


--- mozilla-sqlite.patch DELETED ---