Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-06-12 Jeff Cai <[email protected]>
authorqc161282
Fri, 12 Jun 2009 09:59:19 +0000
changeset 15889 f006ec6a0199
parent 15888 85e59be772ed
child 15890 f943d3288430
2009-06-12 Jeff Cai <[email protected]> * base-specs/evolution-data-server.spec: * base-specs/evolution.spec: * patches/evolution-15-nss.diff: * patches/evolution-data-server-04-nss.diff: Add two patches to fix #585523. Since nss/nspr has a private copy of sqlite3, it says a symbol is not found if linking to libsoftoken3.
ChangeLog file | annotate | diff | comparison | revisions
base-specs/evolution-data-server.spec file | annotate | diff | comparison | revisions
base-specs/evolution.spec file | annotate | diff | comparison | revisions
patches/evolution-15-nss.diff file | annotate | diff | comparison | revisions
patches/evolution-data-server-04-nss.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu Jun 11 11:47:54 2009 +0000
+++ b/ChangeLog	Fri Jun 12 09:59:19 2009 +0000
@@ -1,3 +1,13 @@
+2009-06-12  Jeff Cai <[email protected]>
+
+	* base-specs/evolution-data-server.spec:
+	* base-specs/evolution.spec:
+	* patches/evolution-15-nss.diff:
+	* patches/evolution-data-server-04-nss.diff:
+	Add two patches to fix #585523.
+	Since nss/nspr has a private copy of sqlite3, it says a symbol
+	is not found if linking to libsoftoken3.
+
 2009-06-11  Ginn Chen <[email protected]>
 
 	* SUNWfirefox.spec: Requires SUNWsqlite3
--- a/base-specs/evolution-data-server.spec	Thu Jun 11 11:47:54 2009 +0000
+++ b/base-specs/evolution-data-server.spec	Fri Jun 12 09:59:19 2009 +0000
@@ -32,6 +32,9 @@
 # date:2009-05-04 owner:jefftsai bugzilla:579199 type:bug
 Patch3:       evolution-data-server-03-http-proxy.diff
 
+# date:2009-06-12 owner:jefftsai bugzilla:585523 type:bug
+Patch4:       evolution-data-server-04-nss.diff
+
 Docdir:       %{_defaultdocdir}/evolution-data-server
 Autoreqprov:  on
 Prereq:       /sbin/ldconfig
@@ -95,6 +98,7 @@
 %patch2 -p0
 %endif
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -196,6 +200,10 @@
 %{_datadir}/idl/*
 
 %changelog
+* Fir Jun 12 2009 - [email protected]
+- Add patch -04-nss to fix #585523
+  Since nss/nspr has a private copy of sqlite3, it says a symbol
+  is not found if link to libsoftoken3.
 * Tue May 26 2009 - [email protected]
 - Bump to 2.27.2
 - Remove patch -04-http-service, upstreamed
--- a/base-specs/evolution.spec	Thu Jun 11 11:47:54 2009 +0000
+++ b/base-specs/evolution.spec	Fri Jun 12 09:59:19 2009 +0000
@@ -48,6 +48,8 @@
 Patch13:       evolution-13-disable-ldap-base-search.diff
 # date:2009-04-29 doo:7769 bugzilla:578907 owner:jefftsai type:bug
 Patch14:       evolution-14-merge-google-contact.diff
+# date:2009-06-12 bugzilla:585523 owner:jefftsai type:bug
+Patch15:       evolution-15-nss.diff
 # date:2009-06-05 bugzilla:584898 owner:jefftsai type:bug
 Patch16:       evolution-16-create-account.diff
 URL:          http://www.gnome.org
@@ -132,6 +134,7 @@
 %patch11 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 %patch16 -p1
 %build
 
@@ -258,6 +261,10 @@
 %{_datadir}/gnome-pilot/*
 
 %changelog
+* Fri Jun 12 2009 - [email protected]
+- Add patch -15-nss, fix #585523
+  Since nss/nspr has a private copy of sqlite3, it says a symbol
+  is not found if linking to libsoftoken3.
 * Fri Jun 05 2009 - [email protected]
 - Add patch 16-create-account.diff to fix bugzilla #584898
 - Check the index before visiting the mail_servers array, if index is -1,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-15-nss.diff	Fri Jun 12 09:59:19 2009 +0000
@@ -0,0 +1,20 @@
+--- evolution-2.27.2/configure.ac.orig	2009-06-12 16:45:28.362266000 +0800
++++ evolution-2.27.2/configure.ac	2009-06-12 16:46:22.137064000 +0800
+@@ -1206,7 +1206,7 @@
+ 					esac
+ 				fi
+ 			else
+-		 		nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
++		 		nsslibs="-lssl3 -lsmime3 -lnss3"
+ 	 		fi	
+ 			
+ 			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
+@@ -1216,7 +1216,7 @@
+ 		      		LIBS="$nsslibs $nsprlibs"
+ 				AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
+ 				if test "$moz_nss_libs" = no; then
+-					nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
++					nsslibs="-lssl3 -lsmime3 -lnss3"
+ 					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+ 					AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")	
+ 				fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-data-server-04-nss.diff	Fri Jun 12 09:59:19 2009 +0000
@@ -0,0 +1,20 @@
+--- evolution-data-server-2.27.2/configure.ac.orig	2009-06-12 15:22:42.483921000 +0800
++++ evolution-data-server-2.27.2/configure.ac	2009-06-12 15:23:17.522044000 +0800
+@@ -707,7 +707,7 @@
+ 					esac
+ 				fi
+ 			else
+-		 		nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
++		 		nsslibs="-lssl3 -lsmime3 -lnss3"
+ 	 		fi	
+ 			
+ 			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
+@@ -717,7 +717,7 @@
+ 		      		LIBS="$nsslibs $nsprlibs"
+ 				AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
+ 				if test "$moz_nss_libs" = no; then
+-					nsslibs="-lssl3 -lsmime3 -lnss3 $SOFTOKN3_LIB"
++					nsslibs="-lssl3 -lsmime3 -lnss3"
+ 					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+ 					AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")	
+ 				fi
sustaining/oi_151a/spec-files