rpms/logjam/FC-4 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.15, 1.16

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-4

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5-patch8-manfix.patch 
Log Message:

New version.


logjam-4.5-patch8-manfix.patch:

--- NEW FILE logjam-4.5-patch8-manfix.patch ---
--- logjam-4.5-patch8/doc/Makefile.in.BAD	2005-07-11 09:22:14.000000000 -0500
+++ logjam-4.5-patch8/doc/Makefile.in	2005-07-11 09:22:24.000000000 -0500
@@ -328,7 +328,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(MANS)
+all-am: Makefile
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(man1dir)


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- logjam.spec	14 Apr 2005 21:51:26 -0000	1.15
+++ logjam.spec	11 Jul 2005 14:43:34 -0000	1.16
@@ -1,38 +1,42 @@
 %define use_xmms 1
 
-Name: logjam
-Version: 4.4.1
-Release: 8
-Epoch: 1
-Summary: GTK2 client for LiveJournal
-License: GPL
-Group: User Interface/Desktops
-URL: http://logjam.danga.com/
-Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2
-Requires: curl >= 7.9, gtkspell
+Name:		logjam
+Version:	4.5
+Release:	0.1patch8%{?dist}
+Epoch:		1
+Summary:	GTK2 client for LiveJournal
+License:	GPL
+Group:		User Interface/Desktops
+URL:		http://logjam.danga.com/
+#This is where the final builds come from. 
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#This is an arch snapshot
+Source0:	logjam-%{version}-patch8.tar.bz2
+Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
-BuildRequires: xmms-devel
+BuildRequires:	xmms-devel
 %endif
-BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
-BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel
-Obsoletes: loserjabber, logjam-gnome
-BuildRoot: %{_tmppath}/logjam-%{version}.root
-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.6.patch
-Patch4: logjam-4.4.1-cleanups.patch
-Patch5: logjam-4.4.1-fedora-desktop.patch
+BuildRequires:	curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel
+BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
+BuildRequires:	libsoup-devel, sqlite-devel
+Obsoletes:	loserjabber, logjam-gnome
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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-cleanups.patch
+Patch4:		logjam-4.4.1-fedora-desktop.patch
+Patch5:		logjam-4.5-patch8-manfix.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
 
 %if %{use_xmms}
 %package xmms
-Summary: LogJam helper binary
-Group: User Interface/Desktops
-Requires: logjam, xmms
-BuildRequires: xmms-devel
+Summary:	LogJam helper binary
+Group:		User Interface/Desktops
+Requires:	logjam, xmms
+BuildRequires:	xmms-devel
 
 %description xmms
 This is a helper binary for LogJam which is used to get the
@@ -40,19 +44,23 @@
 %endif
 
 %prep
-%setup -n %{name}-%{version} -q
+%setup -n %{name}-%{version}-patch8 -q
 %patch0 -p1 -b .offline-segfaultfix
 %patch1 -p1 -b .rupo
 %patch2 -p1 -b .backdated
-%patch3 -p1 -b .gtkhtml36
-%patch4 -p1 -b .cleanups
-%patch5 -p1 -b .desktop
+%patch3 -p1 -b .cleanups
+%patch4 -p1 -b .desktop
+%patch5 -p1 -b .manfix
 
 %build
-%configure \
+%configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
 %endif
+cp libtool protocol/liblivejournal
+cd gen
+./regen.sh
+cd ..
 make
 
 %install
@@ -83,6 +91,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.5-0.1patch8
+- bump to patch8
+
 * Thu Apr 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 4.4.1-8
 - actually apply patch. :P