rpms/xulrunner/devel mozilla-sqlite.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 sources, 1.60, 1.61 xulrunner.spec, 1.123, 1.124

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26761

Modified Files:
	.cvsignore sources xulrunner.spec 
Added Files:
	mozilla-sqlite.patch 
Log Message:
* Thu May 16 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
- Update to latest trunk (2008-05-16)


mozilla-sqlite.patch:

--- NEW FILE mozilla-sqlite.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=424063

Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1992
diff -d -u -p -r1.1992 configure.in
--- mozilla/configure.in	5 May 2008 21:08:14 -0000	1.1992
+++ mozilla/configure.in	17 May 2008 02:26:32 -0000
@@ -5958,7 +5958,17 @@ then
     SQLITE_CFLAGS=
     SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
 else
-    PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
+    SQLITE_VERSION_NUMBER=3005007
+    AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION)
+    AC_TRY_COMPILE([#include <sqlite3.h>], [
+#                   if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER
+#                   error "sqlite version < $SQLITE_VERSION_NUMBER
+#                   endif
+                    ] , [res=yes], [res=no])
+    AC_MSG_RESULT([$res])
+    if test "$res" != "yes"; then
+        AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required])
+    fi
 fi
 
 AC_SUBST(MOZ_NATIVE_SQLITE)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	17 Apr 2008 02:23:03 -0000	1.58
+++ .cvsignore	17 May 2008 03:24:14 -0000	1.59
@@ -1 +1 @@
-mozilla-20080416.tar.bz2
+mozilla-20080516.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	17 Apr 2008 02:23:03 -0000	1.60
+++ sources	17 May 2008 03:24:14 -0000	1.61
@@ -1 +1 @@
-cbe123d9c1e8f26e03965d741980817f  mozilla-20080416.tar.bz2
+53a9e0126ec237968a47fad84bd02d0c  mozilla-20080516.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- xulrunner.spec	15 May 2008 03:40:30 -0000	1.123
+++ xulrunner.spec	17 May 2008 03:24:14 -0000	1.124
@@ -7,14 +7,14 @@
 %define version_internal  1.9pre
 
 %if ! %{official_branding}
-%define cvsdate 20080416
+%define cvsdate 20080516
 %define nightly .cvs%{cvsdate}
 %endif
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.62%{?nightly}%{?dist}
+Release:        0.63%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -30,6 +30,7 @@
 Source23:       %{name}.1
 
 # build patches
+Patch1:         mozilla-sqlite.patch
 Patch4:         mozilla-build.patch
 Patch5:         xulrunner-path.patch
 Patch6:         xulrunner-version.patch
@@ -102,6 +103,7 @@
 %prep
 %setup -q -c
 cd mozilla
+%patch1   -p1 -b .sqlite
 %patch4   -p1
 %patch5   -p1
 %patch6   -p1 -b .ver
@@ -115,6 +117,7 @@
 
 %build
 cd mozilla
+autoconf-2.13
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
@@ -390,6 +393,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu May 16 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
+- Update to latest trunk (2008-05-16)
+
 * Fri Apr 18 2008 Martin Stransky <stransky at redhat.com> 1.9-0.62
 - Fixed multilib issues, added starting script instead of a symlink
   to binary (#436393)