rpms/logjam/devel logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 logjam.spec, 1.21, 1.22 sources, 1.6, 1.7

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	.cvsignore logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [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(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
-    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(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
-      with_gtkhtml="no"
+      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
   if test "$with_gtkhtml" != "no"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 14:38:20 -0000	1.4
+++ .cvsignore	5 Jan 2006 17:57:29 -0000	1.5
@@ -1,2 +1,3 @@
 logjam-4.4.1.tar.bz2
 logjam-4.5.1.tar.bz2
+logjam-4.5.2.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- logjam.spec	6 Sep 2005 22:02:54 -0000	1.21
+++ logjam.spec	5 Jan 2006 17:57:29 -0000	1.22
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 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
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:54 -0000	1.6
+++ sources	5 Jan 2006 17:57:29 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2