rpms/logjam/devel logjam-4.5.3-gtkhtml314.patch, NONE, 1.1 logjam.spec, 1.30, 1.31

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-gtkhtml314.patch 
Log Message:

Build again in devel.


logjam-4.5.3-gtkhtml314.patch:

--- NEW FILE logjam-4.5.3-gtkhtml314.patch ---
--- logjam-4.5.3/configure.in.gtkhtml314	2007-03-19 13:53:48.000000000 -0500
+++ logjam-4.5.3/configure.in	2007-03-19 13:57:44.000000000 -0500
@@ -74,21 +74,37 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+   LJ_PKG_ARG_WITH(gtkhtml314, GTKHTML314,
+    AC_HELP_STRING([--with-gtkhtml314],
+                   [compile with GtkHtml3.14 support (default autodetect)]),
+    libgtkhtml-3.14)
+  if test "$with_gtkhtml314" = "yes"; then
+    with_gtkhtml="3.14"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+      AC_HELP_STRING([--with-gtkhtml38],
+                     [compile with GtkHtml3.8 support (default autodetect)]),
+      libgtkhtml-3.8)
+    if test "$with_gtkhtml38" = "yes"; then
+      with_gtkhtml="3.8"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+        AC_HELP_STRING([--with-gtkhtml36],
+                       [compile with GtkHtml3.6 support (default autodetect)]),
+        libgtkhtml-3.6)
+      if test "$with_gtkhtml36" = "yes"; then
+        with_gtkhtml="3.6"
+      else
+        LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+          AC_HELP_STRING([--with-gtkhtml30],
+                         [compile with GtkHtml3.0 support (default autodetect)]),
+          libgtkhtml-3.0)
+        if test "$with_gtkhtml30" = "yes"; then
+          with_gtkhtml="3.0"
+        else
+          with_gtkhtml="no"
+        fi
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- logjam.spec	19 Jan 2007 04:51:57 -0000	1.30
+++ logjam.spec	19 Mar 2007 19:38:51 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	8%{?dist}
+Release:	9%{?dist}.1
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -23,7 +23,7 @@
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
-Patch6:		logjam-4.5.2-gtkhtml38.patch
+Patch6:		logjam-4.5.3-gtkhtml314.patch
 Patch7:		logjam-4.4.1-ru.po.asp.patch
 Patch8:		logjam-4.5.3-gtkspell.patch
 Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
@@ -50,7 +50,7 @@
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml38
+%patch6 -p1 -b .gtkhtml314
 %patch7 -p1 -b .ru.po
 %patch8 -p1 -b .bz186906
 %patch9 -p1 -b .docklet-context-menu
@@ -94,6 +94,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-9.1
+- rebuild for new gtkhtml, new patch to detect it
+
 * Thu Jan 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.3-8
 - Rename a locale directory to resolve bugzilla 210206