rpms/logjam/devel logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.37, 1.38
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue Mar 11 20:21:44 UTC 2008
- Previous message (by thread): rpms/gnome-icon-theme/devel .cvsignore, 1.51, 1.52 gnome-icon-theme.spec, 1.78, 1.79 sources, 1.54, 1.55
- Next message (by thread): rpms/logjam/F-7 logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26155/devel
Modified Files:
logjam-4.5.3-tags.patch logjam.spec
Log Message:
fix 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.5.3-tags.patch 11 Mar 2008 19:53:11 -0000 1.1
+++ logjam-4.5.3-tags.patch 11 Mar 2008 20:21:42 -0000 1.2
@@ -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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/tags.h 2008-03-11 16:17:54.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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/types.c 2008-03-11 16:17:54.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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/Makefile.am 2008-03-11 16:17:54.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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/livejournal.h 2008-03-11 16:17:54.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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.h 2008-03-11 16:17:54.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 15:09:55.000000000 -0400
++++ logjam-4.5.3/protocol/liblivejournal/livejournal/gettags.c 2008-03-11 16:17:54.000000000 -0400
@@ -0,0 +1,65 @@
+
+#include <config.h>
@@ -171,7 +171,7 @@
+
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 15:16:52.000000000 -0400
++++ logjam-4.5.3/src/tags.c 2008-03-11 16:17:54.000000000 -0400
@@ -0,0 +1,181 @@
+
+#include "gtk-all.h"
@@ -356,7 +356,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 15:09:55.000000000 -0400
++++ logjam-4.5.3/src/tags.h 2008-03-11 16:17:54.000000000 -0400
@@ -0,0 +1,6 @@
+#ifndef _TAGS_H_
+#define _TAGS_H_
@@ -366,7 +366,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 15:09:55.000000000 -0400
++++ logjam-4.5.3/src/Makefile.am 2008-03-11 16:17:54.000000000 -0400
@@ -59,6 +59,7 @@ src_gtk = gtk-all.h util-gtk.c util-gtk.
undo.c undo.h \
userlabel.c userlabel.h \
@@ -376,9 +376,17 @@
src_preview = $(PREVIEW)
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 2005-06-19 14:05:40.000000000 -0400
-+++ logjam-4.5.3/src/jamview.c 2008-03-11 15:09:55.000000000 -0400
-@@ -408,11 +408,34 @@ music_store(JamView *view) {
+--- 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
+@@ -19,6 +19,7 @@
+ #include "security.h"
+ #include "marshalers.h"
+ #include "datesel.h"
++#include "tags.h"
+
+ #define KEY_PICTUREKEYWORD "logjam-picturekeyword"
+
+@@ -408,11 +409,34 @@ music_store(JamView *view) {
jam_doc_set_music(view->doc, music);
}
Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- logjam.spec 11 Mar 2008 20:00:04 -0000 1.37
+++ logjam.spec 11 Mar 2008 20:21:42 -0000 1.38
@@ -2,7 +2,7 @@
Name: logjam
Version: 4.5.3
-Release: 14%{?dist}
+Release: 15%{?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-15
+- fix tags patch
+
* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-14
- missed one patch
- Previous message (by thread): rpms/gnome-icon-theme/devel .cvsignore, 1.51, 1.52 gnome-icon-theme.spec, 1.78, 1.79 sources, 1.54, 1.55
- Next message (by thread): rpms/logjam/F-7 logjam-4.5.3-tags.patch, 1.1, 1.2 logjam.spec, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list