rpms/gaim/FC-4 gaim-1.5.0-logging-compatibility.patch, NONE, 1.1 gaim-1.5.0-nss-detect.patch, NONE, 1.1 gaim-desktop.patch, 1.14, NONE

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10957

Added Files:
	gaim-1.5.0-logging-compatibility.patch 
	gaim-1.5.0-nss-detect.patch 
Removed Files:
	gaim-desktop.patch 
Log Message:
add patches


gaim-1.5.0-logging-compatibility.patch:
 log.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-logging-compatibility.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.103.2.8
diff -u -d -p -r1.103.2.8 log.c
--- src/log.c	16 Aug 2005 17:53:37 -0000	1.103.2.8
+++ src/log.c	6 Feb 2006 21:26:02 -0000
@@ -424,7 +424,7 @@ static GList *log_lister_common(GaimLogT
 
 	while ((filename = g_dir_read_name(dir))) {
 		if (gaim_str_has_suffix(filename, ext) &&
-				strlen(filename) == 17 + strlen(ext)) {
+				strlen(filename) >= 17 + strlen(ext)) {
 			GaimLog *log;
 			struct generic_logger_data *data;
 			time_t stamp = gaim_str_to_time(filename, FALSE);

gaim-1.5.0-nss-detect.patch:
 configure |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gaim-1.5.0-nss-detect.patch ---
--- gaim-1.5.0/configure.nss	2005-12-21 05:44:07.000000000 -0500
+++ gaim-1.5.0/configure	2005-12-21 05:44:31.000000000 -0500
@@ -34009,23 +34009,23 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for mozilla-nss" >&5
-echo $ECHO_N "checking for mozilla-nss... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for nss" >&5
+echo $ECHO_N "checking for nss... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "mozilla-nss" ; then
+        if $PKG_CONFIG --exists "nss" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
 echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
-            NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nss"`
+            NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"`
             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
 echo "${ECHO_T}$NSS_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
 echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
-            NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nss"`
+            NSS_LIBS=`$PKG_CONFIG --libs "nss"`
             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
 echo "${ECHO_T}$NSS_LIBS" >&6
         else
@@ -34033,7 +34033,7 @@
             NSS_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nss"`
+            NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nss"`
 
         fi
 
@@ -34054,7 +34054,7 @@
 
 		if test "x$have_nss" = "xyes"; then
 			mozilla_nspr="mozilla-nspr"
-			mozilla_nss="mozilla-nss"
+			mozilla_nss="nss"
 
 
 cat >>confdefs.h <<\_ACEOF


--- gaim-desktop.patch DELETED ---