rpms/logjam/devel logjam-4.5.3-tags.patch, 1.3, 1.4 logjam.spec, 1.41, 1.42

Tom Callaway (spot) fedora-extras-commits at redhat.com
Tue Mar 11 21:59:06 UTC 2008


Author: spot

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

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Log Message:
one more autoconf change

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logjam-4.5.3-tags.patch	11 Mar 2008 21:06:22 -0000	1.3
+++ logjam-4.5.3-tags.patch	11 Mar 2008 21:58:59 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h	2008-03-11 17:53:46.000000000 -0400
 @@ -0,0 +1,18 @@
 +/* liblivejournal - a client library for LiveJournal.
 + * Copyright (C) 2003 Evan Martin <evan at livejournal.com>
@@ -22,7 +22,7 @@
 +#endif /* __LIVEJOURNAL_TAGS_H__ */
 diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags logjam-4.5.3/protocol/liblivejournal/livejournal/types.c
 --- logjam-4.5.3/protocol/liblivejournal/livejournal/types.c.tags	2005-10-23 21:29:32.000000000 -0400
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c	2008-03-11 17:53:46.000000000 -0400
 @@ -14,6 +14,7 @@
  
  #include "entry.h"
@@ -52,7 +52,7 @@
  	char *text = NULL;
 diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am
 --- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am.tags	2005-08-24 22:42:14.000000000 -0400
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am	2008-03-11 17:53:46.000000000 -0400
 @@ -7,7 +7,7 @@ liblivejournal_la_LIBADD = @LIVEJOURNAL_
  liblivejournal_la_SOURCES = \
  	md5.c              md5.h            \
@@ -72,7 +72,7 @@
  	livejournal.h
 diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h
 --- logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h.tags	2005-02-21 12:46:10.000000000 -0500
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h	2008-03-11 17:53:46.000000000 -0400
 @@ -16,5 +16,6 @@
  #include <livejournal/serveruser.h>
  #include <livejournal/friends.h>
@@ -82,7 +82,7 @@
  #endif /* __LIVEJOURNAL_H__ */
 diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h	2008-03-11 17:53:46.000000000 -0400
 @@ -0,0 +1,16 @@
 +
 +#ifndef __LIVEJOURNAL_GETTAGS_H__
@@ -102,7 +102,7 @@
 +
 diff -up /dev/null logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
-+++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c	2008-03-11 17:53:46.000000000 -0400
 @@ -0,0 +1,65 @@
 +
 +#include <config.h>
@@ -169,9 +169,55 @@
 +	g_free(gettags);
 +}
 +
+diff -up logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in
+--- logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in.tags	2006-01-19 03:18:52.000000000 -0500
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.in	2008-03-11 17:57:21.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
+@@ -182,7 +183,7 @@ liblivejournal_la_DEPENDENCIES =
+ am_liblivejournal_la_OBJECTS = md5.lo protocol.lo serveruser.lo entry.lo \
+ 	types.lo verb.lo login.lo checkfriends.lo consolecommand.lo \
+ 	editfriends.lo editfriendgroups.lo editpostevent.lo \
+-	getchallenge.lo getevents.lo getfriends.lo syncitems.lo sync.lo
++	getchallenge.lo getevents.lo getfriends.lo gettags.lo syncitems.lo sync.lo
+ liblivejournal_la_OBJECTS = $(am_liblivejournal_la_OBJECTS)
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+@@ -194,7 +195,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/editfriends.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/editpostevent.Plo ./$(DEPDIR)/entry.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/getchallenge.Plo \
+- at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo \
++ at AMDEP_TRUE@	./$(DEPDIR)/getevents.Plo ./$(DEPDIR)/gettags.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/getfriends.Plo ./$(DEPDIR)/login.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/md5.Plo ./$(DEPDIR)/protocol.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/serveruser.Plo ./$(DEPDIR)/sync.Plo \
+@@ -247,6 +248,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getchallenge.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getevents.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/getfriends.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettags.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/login.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/protocol.Plo at am__quote@
 diff -up /dev/null logjam-4.5.3/src/tags.c
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
-+++ logjam-4.5.3/src/tags.c	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/src/tags.c	2008-03-11 17:53:46.000000000 -0400
 @@ -0,0 +1,181 @@
 +
 +#include "gtk-all.h"
@@ -356,7 +402,7 @@
 +}
 diff -up /dev/null logjam-4.5.3/src/tags.h
 --- /dev/null	2008-03-11 09:22:57.310023055 -0400
-+++ logjam-4.5.3/src/tags.h	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/src/tags.h	2008-03-11 17:53:46.000000000 -0400
 @@ -0,0 +1,6 @@
 +#ifndef _TAGS_H_
 +#define _TAGS_H_
@@ -366,7 +412,7 @@
 +#endif /* _TAGS_H_ */
 diff -up logjam-4.5.3/src/Makefile.am.tags logjam-4.5.3/src/Makefile.am
 --- logjam-4.5.3/src/Makefile.am.tags	2005-10-23 21:16:08.000000000 -0400
-+++ logjam-4.5.3/src/Makefile.am	2008-03-11 16:17:54.000000000 -0400
++++ logjam-4.5.3/src/Makefile.am	2008-03-11 17:53:46.000000000 -0400
 @@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
            undo.c undo.h \
            userlabel.c userlabel.h \
@@ -375,9 +421,29 @@
            $(HTML_MARKUP)
  
  src_preview = $(PREVIEW)
+diff -up logjam-4.5.3/src/Makefile.in.tags logjam-4.5.3/src/Makefile.in
+--- logjam-4.5.3/src/Makefile.in.tags	2006-01-19 03:18:44.000000000 -0500
++++ logjam-4.5.3/src/Makefile.in	2008-03-11 17:53:46.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 \
 diff -up logjam-4.5.3/src/jamview.c.tags logjam-4.5.3/src/jamview.c
---- logjam-4.5.3/src/jamview.c.tags	2008-03-11 16:17:54.000000000 -0400
-+++ logjam-4.5.3/src/jamview.c	2008-03-11 16:18:24.000000000 -0400
+--- logjam-4.5.3/src/jamview.c.tags	2008-03-11 17:53:46.000000000 -0400
++++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400
 @@ -19,6 +19,7 @@
  #include "security.h"
  #include "marshalers.h"
@@ -421,43 +487,3 @@
  	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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- logjam.spec	11 Mar 2008 21:45:11 -0000	1.41
+++ logjam.spec	11 Mar 2008 21:58:59 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	18%{?dist}
+Release:	19%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -107,6 +107,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-19
+- i'm going to beat autoconf
+
 * Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-18
 - seriously, this is getting old now. added libtool to BR.
 




More information about the fedora-extras-commits mailing list