rpms/seamonkey/F-10 seamonkey-1.1.18-sqlite.patch, NONE, 1.1 seamonkey.spec, 1.53, 1.54 sources, 1.26, 1.27

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13470

Modified Files:
	seamonkey.spec sources 
Added Files:
	seamonkey-1.1.18-sqlite.patch 
Log Message:
Update to 1.1.18

seamonkey-1.1.18-sqlite.patch:
 db/sqlite3/src/Makefile.in |    4 ++--
 storage/build/Makefile.in  |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE seamonkey-1.1.18-sqlite.patch ---
diff -up seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in
--- seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in.old	2009-08-10 19:59:12.000000000 +0200
+++ seamonkey-1.1.18/mozilla/db/sqlite3/src/Makefile.in	2009-09-08 13:14:23.000000000 +0200
@@ -44,9 +44,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE           = sqlite3
-LIBRARY_NAME     = sqlite3
+LIBRARY_NAME     = sqlite3_s
 MODULE_NAME      = sqlite3
-FORCE_SHARED_LIB = 1
+FORCE_STATIC_LIB = 1
 VISIBILITY_FLAGS =
 
 ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
diff -up seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old seamonkey-1.1.18/mozilla/storage/build/Makefile.in
--- seamonkey-1.1.18/mozilla/storage/build/Makefile.in.old	2009-08-07 22:37:55.000000000 +0200
+++ seamonkey-1.1.18/mozilla/storage/build/Makefile.in	2009-09-08 13:16:20.000000000 +0200
@@ -69,9 +69,8 @@ LOCAL_INCLUDES = \
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \
 	$(NULL)
- 
-EXTRA_DSO_LIBS += sqlite3
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \


Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/seamonkey.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- seamonkey.spec	10 Jul 2009 11:19:14 -0000	1.53
+++ seamonkey.spec	8 Sep 2009 12:28:37 -0000	1.54
@@ -11,7 +11,7 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.1.17
+Version:        1.1.18
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPLv1.1
@@ -51,6 +51,7 @@ Patch220:       seamonkey-fedora-home-pa
 Patch225:       mozilla-nspr-packages.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
 Patch304:       mozilla-1.7.5-g-application-name.patch
+Patch305:       seamonkey-1.1.18-sqlite.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{minimum_build_nspr_version}
@@ -139,6 +140,7 @@ cd mozilla
 %patch225 -p1
 %patch301 -p1
 %patch304 -p0
+%patch305 -p2 -b .sqlite
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -437,6 +439,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Sep 8 2009 Martin Stransky <stransky at redhat.com> 1.1.18-1
+- Update to 1.1.18
+
 * Fri Jul 10 2009 Martin Stransky <stransky at redhat.com> 1.1.17-1
 - Update to 1.1.17
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	10 Jul 2009 11:19:14 -0000	1.26
+++ sources	8 Sep 2009 12:28:37 -0000	1.27
@@ -1 +1 @@
-9eba600ba6ca522b8eada9a0a8e890e2  seamonkey-1.1.17.source.tar.bz2
+ef4455becf3a12833dca7dd92854aeaa  seamonkey-1.1.18.source.tar.bz2