rpms/logjam/devel logjam-4.4.1-gtkhtml3.1.patch, NONE, 1.1 logjam.spec, 1.4, 1.5

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.4.1-gtkhtml3.1.patch 
Log Message:
auto-import logjam-4.4.1-2 on branch devel from logjam-4.4.1-2.src.rpm

logjam-4.4.1-gtkhtml3.1.patch:

--- NEW FILE logjam-4.4.1-gtkhtml3.1.patch ---
--- logjam-4.4.1/configure.BAD	2005-02-10 23:48:30.000000000 -0600
+++ logjam-4.4.1/configure	2005-02-10 23:48:50.000000000 -0600
@@ -21082,8 +21082,8 @@ fi
   else
     if test "$with_gtkhtml" = "yes"; then
       echo "$as_me:$LINENO: checking for libgtkhtml-3.0" >&5
-echo $ECHO_N "checking for libgtkhtml-3.0... $ECHO_C" >&6
-      if $PKG_CONFIG --exists "libgtkhtml-3.0" ; then
+echo $ECHO_N "checking for libgtkhtml-3.1... $ECHO_C" >&6
+      if $PKG_CONFIG --exists "libgtkhtml-3.1" ; then
 	echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	HAVE_GTKHTML=yes
@@ -21092,7 +21092,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_GTKHTML 1
 _ACEOF
 
-	MODULES="$MODULES libgtkhtml-3.0"
+	MODULES="$MODULES libgtkhtml-3.1"
       else
 	echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
--- logjam-4.4.1/configure.in.BAD	2005-02-10 23:49:09.000000000 -0600
+++ logjam-4.4.1/configure.in	2005-02-10 23:49:18.000000000 -0600
@@ -58,7 +58,7 @@ if test "$with_gtk" = "yes" ; then
   LJ_PKG_ARG_WITH(gtkhtml, GTKHTML,
     AC_HELP_STRING([--with-gtkhtml],
                    [compile with GtkHtml3 support (default autodetect)]),
-    libgtkhtml-3.0)
+    libgtkhtml-3.1)
 
   LJ_PKG_ARG_WITH(librsvg, LIBRSVG,
     AC_HELP_STRING([--with-librsvg],


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- logjam.spec	11 Feb 2005 05:39:25 -0000	1.4
+++ logjam.spec	11 Feb 2005 05:58:18 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: logjam
 Version: 4.4.1
-Release: 1
+Release: 2
 Epoch: 1
 Summary: The GTK2-client for LiveJournal
 License: GPL
@@ -21,6 +21,7 @@
 Patch0: logjam-4.4.1-offline-segfaultfix.patch
 Patch1: logjam-4.4.1-rupo.patch
 Patch2: logjam-4.4.1-backdated.patch
+Patch3: logjam-4.4.1-gtkhtml3.1.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -42,6 +43,7 @@
 %patch0 -p1 -b .offline-segfaultfix
 %patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
+%patch3 -p1 -b .gtkhtml31
 
 %build
 %configure \
@@ -81,7 +83,7 @@
 * Thu Feb 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-1
 - Bump to current version
 - Compile fix patch is obsoleted
-- Gtkhtml 3.1 patch is obsoleted
+- Gtkhtml 3.1 patch changed for 4.4.1
 - Adopt some changes from Kir Kolyshkin's package
   - Make xmms subpackage, with use_xmms conditional
   - Fix a segfault triggered by pressing "Copy URL" button in offline browser