rpms/logjam/devel logjam-4.5.3-tags.patch, 1.2, 1.3 logjam.spec, 1.38, 1.39

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Log Message:

Add Makefile.in bits to tags patch


logjam-4.5.3-tags.patch:

Index: logjam-4.5.3-tags.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-tags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logjam-4.5.3-tags.patch	11 Mar 2008 20:21:42 -0000	1.2
+++ logjam-4.5.3-tags.patch	11 Mar 2008 21:06:22 -0000	1.3
@@ -421,3 +421,43 @@
  	gtk_box_reorder_child(GTK_BOX(view), view->tagsbar, view->musicbar ? 2 : 1);
  	gtk_widget_show_all(view->tagsbar);
  }
+diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in
+--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.BAD	2008-03-11 17:02:35.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in	2008-03-11 17:03:49.000000000 -0400
+@@ -153,7 +153,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
+ liblivejournal_la_SOURCES = \
+ 	md5.c              md5.h            \
+ 	protocol.c         protocol.h       \
+-	friends.h                           \
++	friends.h          tags.h           \
+ 	serveruser.c       serveruser.h     \
+ 	entry.c            entry.h          \
+ 	types.c            types.h          \
+@@ -167,6 +167,7 @@ liblivejournal_la_SOURCES = \
+ 	getchallenge.c     getchallenge.h   \
+ 	getevents.c        getevents.h      \
+ 	getfriends.c       getfriends.h     \
++	gettags.c          gettags.h        \
+ 	syncitems.c        syncitems.h      \
+ 	sync.c             sync.h           \
+ 	livejournal.h
+diff -up logjam-4.5.3/src/Makefile.in.BAD logjam-4.5.3/src/Makefile.in
+--- logjam-4.5.3/src/Makefile.in.BAD	2008-03-11 17:01:21.000000000 -0400
++++ logjam-4.5.3/src/Makefile.in	2008-03-11 17:01:52.000000000 -0400
+@@ -281,6 +281,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
+           undo.c undo.h \
+           userlabel.c userlabel.h \
+           get_cmd_out.c get_cmd_out.h \
++          tags.c tags.h \
+           $(HTML_MARKUP)
+ 
+ 
+@@ -326,7 +327,7 @@ am__logjam_SOURCES_DIST = glib-all.h ini
+ 	login.c login.h manager.c spawn.c spawn.h icons.c icons.h \
+ 	music.c music.h datesel.c datesel.h moodpicker.c pollcreator.c \
+ 	pollcreator.h poll.h poll-questions.c undo.c undo.h userlabel.c \
+-	userlabel.h get_cmd_out.c get_cmd_out.h html_markup.c \
++	userlabel.h get_cmd_out.c get_cmd_out.h tags.c tags.h html_markup.c \
+ 	html_markup.h network-win32.c network-fork.c network-soup.c \
+ 	network-curl.c network-libxml.c eggtrayicon.c eggtrayicon.h \
+ 	docklet.c preview.c preview.h journalstore-sqlite.c \


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- logjam.spec	11 Mar 2008 20:21:42 -0000	1.38
+++ logjam.spec	11 Mar 2008 21:06:22 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	15%{?dist}
+Release:	16%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -64,7 +64,7 @@
 %patch12 -p1 -b .disablethreads
 %patch13 -p1 -b .title
 %patch14 -p1 -b .tags
-# %patch15 -p1 -b .default-spelllang-en-US
+%patch15 -p1 -b .default-spelllang-en-US
 
 %build
 autoconf
@@ -104,6 +104,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-16
+- add Makefile.in bits to tags patch
+
 * Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-15
 - fix tags patch