rpms/logjam/F-10 0001-Add-Location-support-to-the-logjam.patch, NONE, 1.1 0001-Add-automake-1.11-to-autogen.sh.patch, NONE, 1.1 0001-Add-possibility-to-insert-link-by-nickname.patch, NONE, 1.1 0001-Add-support-of-the-User-Agent-header.patch, NONE, 1.1 0001-Adds-titles-to-links-and-images-and-link-to-images.patch, NONE, 1.1 logjam-4.5.3-tags.patch, 1.4, 1.5 logjam.spec, 1.53, 1.54

Tom Callaway spot at fedoraproject.org
Mon Aug 24 16:31:03 UTC 2009 

Author: spot

Update of /cvs/pkgs/rpms/logjam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2818/F-10

Modified Files:
	logjam-4.5.3-tags.patch logjam.spec 
Added Files:
	0001-Add-Location-support-to-the-logjam.patch 
	0001-Add-automake-1.11-to-autogen.sh.patch 
	0001-Add-possibility-to-insert-link-by-nickname.patch 
	0001-Add-support-of-the-User-Agent-header.patch 
	0001-Adds-titles-to-links-and-images-and-link-to-images.patch 
Log Message:
get logjam working again

0001-Add-Location-support-to-the-logjam.patch:
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 -
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 ++++++++++++++++++++++++++++
 src/jamview.h                               |    1 
 src/menu.c                                  |    2 +
 src/preview.c                               |    5 ++-
 8 files changed, 70 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-Location-support-to-the-logjam.patch ---
>From 7ab07309963ac85c42ab7f235ac39189091a2718 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 13:53:04 +0300
Subject: [PATCH] Add 'Location' support to the logjam

Originally patch was taken from:
	https://bugs.launchpad.net/ubuntu/+source/logjam/+bug/223939

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 protocol/liblivejournal/livejournal/entry.c |   15 +++++++++++
 protocol/liblivejournal/livejournal/entry.h |    2 +-
 src/jamdoc.c                                |    8 ++++++
 src/jamdoc.h                                |    3 ++
 src/jamview.c                               |   37 +++++++++++++++++++++++++++
 src/jamview.h                               |    1 +
 src/menu.c                                  |    2 +
 src/preview.c                               |    4 ++-
 8 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/protocol/liblivejournal/livejournal/entry.c b/protocol/liblivejournal/livejournal/entry.c
index 838fd42..5bdf12e 100644
--- a/protocol/liblivejournal/livejournal/entry.c
+++ b/protocol/liblivejournal/livejournal/entry.c
@@ -49,6 +49,8 @@ lj_entry_copy(LJEntry *e) {
 		newe->mood = g_strdup(e->mood);
 	if (e->music)
 		newe->music = g_strdup(e->music);
+	if (e->location)
+		newe->location = g_strdup(e->location);
 	if (e->taglist)
 		newe->taglist = g_strdup(e->taglist);
 	if (e->pickeyword)
@@ -61,6 +63,7 @@ lj_entry_free(LJEntry *e) {
 	g_free(e->event);
 	g_free(e->mood);
 	g_free(e->music);
+	g_free(e->location);
 	g_free(e->taglist);
 	g_free(e->pickeyword);
 	g_free(e);
@@ -136,6 +139,8 @@ lj_entry_set_request_fields(LJEntry *entry, LJRequest *request) {
 		lj_request_add_int(request, "prop_current_moodid", entry->moodid);
 	else
 		lj_request_add(request, "prop_current_moodid", "");
+	lj_request_add(request,
+			"prop_current_location", entry->location ? entry->location : "");
 	lj_request_add(request, 
 			"prop_current_music", entry->music ? entry->music : "");
 	lj_request_add(request, 
@@ -191,6 +196,12 @@ lj_entry_load_metadata(LJEntry *entry,
 			g_set_error(err, 0, 0, "Bad UTF-8 in current_music");
 			return FALSE;
 		}
+	} else if (strcmp(key, "current_location") == 0) {
+		entry->location = g_strdup(value);
+		if (!verify_utf8(&entry->location)) {
+			g_set_error(err, 0, 0, "Bad UTF-8 in current_location");
+			return FALSE;
+		}
 	} else if (strcmp(key, "taglist") == 0) {
 		entry->taglist = g_strdup(value);
 		if (!verify_utf8(&entry->taglist)) {
@@ -255,6 +266,7 @@ lj_entry_to_xml_node(LJEntry *entry, void* doc) {
 		}
 	}
 	XML_ENTRY_META_SET(music);
+	XML_ENTRY_META_SET(location);
 	XML_ENTRY_META_SET(taglist);
 	XML_ENTRY_META_SET(pickeyword);
 	if (entry->preformatted)
@@ -479,6 +491,7 @@ lj_entry_load_from_xml_node(LJEntry *entry, xmlDocPtr doc, xmlNodePtr node) {
 			}
 		}
 		else XML_ENTRY_META_GET(music)
+		else XML_ENTRY_META_GET(location)
 		else XML_ENTRY_META_GET(taglist)
 		else XML_ENTRY_META_GET(pickeyword)
 		else if (xmlStrcmp(cur->name, BAD_CAST "preformatted") == 0) {
@@ -605,6 +618,7 @@ rfc822_load_entry(const char *key, const char *val, LJEntry *entry) {
 	RFC822_GET(subject)
 	else RFC822_GET(mood) /* XXX id */
 	else RFC822_GET(music)
+	else RFC822_GET(location)
 	else RFC822_GET(taglist)
 	else RFC822_GET(pickeyword)
 	else if (g_ascii_strcasecmp(key, "time") == 0) {
@@ -748,6 +762,7 @@ lj_entry_to_rfc822(LJEntry *entry, gboolean includeempty) {
 	append_field(str, "Subject", entry->subject, includeempty);
 	append_field(str, "Mood", entry->mood, includeempty);
 	append_field(str, "Music", entry->music, includeempty);
+	append_field(str, "Location", entry->location, includeempty);
 	append_field(str, "TagList", entry->taglist, includeempty);
 	append_field(str, "PicKeyword", entry->pickeyword, includeempty);
 	g_string_append(str, "\n");
diff --git a/protocol/liblivejournal/livejournal/entry.h b/protocol/liblivejournal/livejournal/entry.h
index 4a138e5..2d35f89 100644
--- a/protocol/liblivejournal/livejournal/entry.h
+++ b/protocol/liblivejournal/livejournal/entry.h
@@ -52,7 +52,7 @@ typedef struct _LJEntry {
 	char *event;
 
 	int moodid;  /* a moodid is only meaningful in the context of a particular LJServer. */
-	char *mood, *music, *taglist, *pickeyword;
+	char *mood, *music, *location, *taglist, *pickeyword;
 	gboolean preformatted;
 	gboolean backdated;
 	LJCommentsType comments;
diff --git a/src/jamdoc.c b/src/jamdoc.c
index b3cdf99..ced84a0 100644
--- a/src/jamdoc.c
+++ b/src/jamdoc.c
@@ -240,6 +240,14 @@ jam_doc_set_music(JamDoc *doc, const char *music) {
 	string_replace(&doc->entry->music, music ? g_strdup(music) : NULL);
 }
 const char *
+jam_doc_get_location(JamDoc *doc) {
+	return doc->entry->location;
+}
+void
+jam_doc_set_location(JamDoc *doc, const char *location) {
+	string_replace(&doc->entry->location, location ? g_strdup(location) : NULL);
+}
+const char *
 jam_doc_get_taglist(JamDoc *doc) {
 	return doc->entry->taglist;
 }
diff --git a/src/jamdoc.h b/src/jamdoc.h
index 21fae13..99fa8b4 100644
--- a/src/jamdoc.h
+++ b/src/jamdoc.h
@@ -63,6 +63,9 @@ void           jam_doc_set_moodid(JamDoc *doc, int moodid);
 const char *   jam_doc_get_music(JamDoc *doc);
 void           jam_doc_set_music(JamDoc *doc, const char *music);
 
+const char *   jam_doc_get_location(JamDoc *doc);
+void           jam_doc_set_location(JamDoc *doc, const char *location);
+
 const char *   jam_doc_get_taglist(JamDoc *doc);
 void           jam_doc_set_taglist(JamDoc *doc, const char *taglist);
 
diff --git a/src/jamview.c b/src/jamview.c
index ecd1fc2..cb00b3a 100644
--- a/src/jamview.c
+++ b/src/jamview.c
@@ -43,6 +43,9 @@ struct _JamView {
 	GtkWidget *musicbar;
 	GtkWidget *musicbutton, *music;
 
+	GtkWidget *locationbar;
+	GtkWidget *location;
+
 	GtkWidget *tagsbar;
 	GtkWidget *tags;
 
@@ -428,6 +431,39 @@ tags_select_cb(JamView *view) {
 }
 
 static void
+location_add(JamView *view) {
+	view->location = gtk_entry_new();
+	view->locationbar = labelled_box_new_sg(_("_Location:"), view->location, view->sizegroup);
+	gtk_box_pack_start(GTK_BOX(view), view->locationbar, FALSE, FALSE, 0);
+	gtk_box_reorder_child(GTK_BOX(view), view->locationbar, view->moodpicbar ? 2 : 1);
+	gtk_widget_show_all(view->locationbar);
+}
+static void
+location_remove(JamView *view) {
+	jam_doc_set_location(view->doc, NULL);
+	gtk_widget_destroy(view->locationbar);
+	view->locationbar = view->location = NULL;
+}
+static gboolean
+location_visible(JamView *view) {
+	return view->locationbar != NULL;
+}
+static void
+location_load(JamView *view) {
+	const char *location = jam_doc_get_location(view->doc);
+	if (location)
+		show_meta(view, JAM_VIEW_LOCATION);
+	if (location_visible(view))
+		gtk_entry_set_text(GTK_ENTRY(view->location), location ? location : "");
+}
+static void
+location_store(JamView *view) {
+	const char *location = gtk_entry_get_text(GTK_ENTRY(view->location));
+	if (location[0] == 0) location = NULL;
+	jam_doc_set_location(view->doc, location);
+}
+
+static void
 tags_add(JamView *view) {
 	GtkWidget *tagbutton;
 	view->tags = gtk_entry_new();
@@ -590,6 +626,7 @@ static struct {
 	{ "mood",         TRUE, STD(mood),         mood_account_changed     },
 	{ "picture",      TRUE, STD(picture),      picture_account_changed  },
 	{ "music",        TRUE, STD(music),        NULL },
+	{ "location",     TRUE, STD(location),     NULL },
 	{ "tags",         TRUE, STD(tags),         NULL },
 	{ "preformatted", TRUE, STD(preformatted), NULL },
 	{ "datesel",      TRUE, STD(datesel),      NULL },
diff --git a/src/jamview.h b/src/jamview.h
index 0862054..a4efbf5 100644
--- a/src/jamview.h
+++ b/src/jamview.h
@@ -21,6 +21,7 @@ typedef enum {
 	JAM_VIEW_MOOD,
 	JAM_VIEW_PIC,
 	JAM_VIEW_MUSIC,
+	JAM_VIEW_LOCATION,
 	JAM_VIEW_TAGS,
 	JAM_VIEW_PREFORMATTED,
 	JAM_VIEW_DATESEL,
diff --git a/src/menu.c b/src/menu.c
index 6ca6e23..97bd611 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -56,6 +56,7 @@ enum {
 	ACTION_VIEW_MOOD,
 	ACTION_VIEW_PICTURE,
 	ACTION_VIEW_MUSIC,
+	ACTION_VIEW_LOCATION,
 	ACTION_VIEW_TAGS,
 	ACTION_VIEW_PREFORMATTED,
 	ACTION_VIEW_DATESEL,
@@ -430,6 +431,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/View/_Picture"),           NULL, menu_view_cb, ACTION_VIEW_PICTURE,      "<CheckItem>" },
 { N_("/View/_Tags"),              NULL, menu_view_cb, ACTION_VIEW_TAGS,         "<CheckItem>" },
 { N_("/View/M_usic"),             NULL, menu_view_cb, ACTION_VIEW_MUSIC,        "<CheckItem>" },
+{ N_("/View/_Location"),          NULL, menu_view_cb, ACTION_VIEW_LOCATION,     "<CheckItem>" },
 { N_("/View/_Preformatted"),      NULL, menu_view_cb, ACTION_VIEW_PREFORMATTED, "<CheckItem>" },
 { N_("/View/_Comments"),          NULL, menu_view_cb, ACTION_VIEW_COMMENTS,     "<CheckItem>" },
 
diff --git a/src/preview.c b/src/preview.c
index b3abc2e..5ee3fbc 100644
--- a/src/preview.c
+++ b/src/preview.c
@@ -179,11 +179,13 @@ entry_prepare_preview(LJEntry *entry) {
 		g_string_append(str, "</tr></table><hr/><br/>");
 	}
 
-	if (entry->mood || entry->music || entry->taglist) {
+	if (entry->mood || entry->music || entry->location || entry->taglist) {
 		if (entry->mood)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Mood"), entry->mood);
 		if (entry->music)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Music"), entry->music);
+		if (entry->location)
+			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Current Location"), entry->location);
 		if (entry->taglist)
 			g_string_append_printf(str, "<i>%s</i>: %s<br/>", _("Tags"), entry->taglist);
 		g_string_append(str, "<br/>");
-- 
1.6.4


0001-Add-automake-1.11-to-autogen.sh.patch:
 autogen.sh |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Add-automake-1.11-to-autogen.sh.patch ---
>From bbe8da1dd21a193d232e6b63ed37cb30ea2068ca Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 14:52:09 +0300
Subject: [PATCH] Add automake-1.11 to autogen.sh

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 autogen.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 4b72b88..b01b5f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,12 +311,13 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
 
 case $REQUIRED_AUTOMAKE_VERSION in
     1.4*) automake_progs="automake-1.4" ;;
-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-    1.10*) automake_progs="automake-1.10" ;;
+    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+    1.11*) automake_progs="automake-1.11" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-- 
1.6.4


0001-Add-possibility-to-insert-link-by-nickname.patch:
 link-journal.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

--- NEW FILE 0001-Add-possibility-to-insert-link-by-nickname.patch ---
>From 43ff911da0f0d81a264bc52e8db565e0fb52c2af Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 2 May 2009 15:56:28 +0300
Subject: [PATCH] Add possibility to insert link by nickname

Originally patch was found here:
	http://people.freebsd.org/~novel/patches/non-freebsd/logjam452_userlink.diff

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/link-journal.c |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/src/link-journal.c b/src/link-journal.c
index d70e70d..ec47e2d 100644
--- a/src/link-journal.c
+++ b/src/link-journal.c
@@ -44,11 +44,12 @@ make_usertype_omenu() {
 void
 link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkWidget *dlg;
-	GtkWidget *vbox, *hbox, *entry, *omenu;
+	GtkWidget *vbox, *hbox, *entry, *entry_name, *omenu;
 	GtkSizeGroup *sizegroup;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *username = NULL;
+	char *usernick = NULL;
 	int usertype;
 	gboolean selection = FALSE;
 
@@ -78,6 +79,11 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 	hbox = labelled_box_new_sg(_("_Username:"), entry, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+	entry_name = gtk_entry_new();
+	gtk_entry_set_activates_default(GTK_ENTRY(entry_name), TRUE);
+	hbox = labelled_box_new_sg(_("_Nickname:"), entry_name, sizegroup);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
 	omenu = make_usertype_omenu();
 	hbox = labelled_box_new_sg(_("User _Type:"), omenu, sizegroup);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -89,6 +95,7 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		return;
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -102,6 +109,41 @@ link_journal_dialog_run(GtkWindow *win, JamDoc *doc) {
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usernick && *usernick) {
+		gchar *link;
+		gchar *img;
+		JamAccount *acc = jam_doc_get_account(doc);
+
+		xml_escape(&username);
+		xml_escape(&usernick);
+
+		if (usertype == 0)
+			img = g_strdup("userinfo.gif");
+		else
+			img = g_strdup("community.gif");
+
+		link = g_strdup_printf(
+			"<a href='%s/userinfo.bml?user=%s'>"
+				"<img src='%s/img/%s' alt='[info]' align='absmiddle' width='17' height='17' border='0' />"
+			"</a>"
+			"<a style='FONT-WEIGHT: 800' href='%s/users/%s'>%s</a>",
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			img,
+			jam_account_lj_get_server(JAM_ACCOUNT_LJ(acc))->url,
+			username,
+			usernick);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(img);
+		free(username);
+		free(usernick);
+		return;
+	}
+
 	gtk_text_buffer_insert(buffer, &start, "<lj ", -1);
 	if (usertype == 0)
 		gtk_text_buffer_insert(buffer, &start, "user=\"", -1);
-- 
1.6.4


0001-Add-support-of-the-User-Agent-header.patch:
 network-curl.c     |    2 ++
 network-internal.h |    5 +++++
 network-libxml.c   |    7 +++++++
 network-soup.c     |    5 ++++-
 network-win32.c    |    3 +--
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE 0001-Add-support-of-the-User-Agent-header.patch ---
>From 511a6b7ba39438bc5edaac7c27f1283bf04b75b1 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Sat, 22 Aug 2009 20:42:00 +0300
Subject: [PATCH] Add support of the User-Agent header

Starting from 22.08.2009 the Livejournal refuses all programs which has
not well-formed User-Agent string. Details here:
http://www.livejournal.com/bots/

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/network-curl.c     |    2 ++
 src/network-internal.h |    5 +++++
 src/network-libxml.c   |    7 +++++++
 src/network-soup.c     |    5 ++++-
 src/network-win32.c    |    2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/network-curl.c b/src/network-curl.c
index 12bdc81..94db0af 100644
--- a/src/network-curl.c
+++ b/src/network-curl.c
@@ -96,6 +96,8 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 	}
 
+	curl_easy_setopt(curl, CURLOPT_USERAGENT, LOGJAM_USER_AGENT);
+
 	if (headers) {
 		GSList *l;
 		for (l = headers; l; l = l->next)
diff --git a/src/network-internal.h b/src/network-internal.h
index 991edfc..9103bc8 100644
--- a/src/network-internal.h
+++ b/src/network-internal.h
@@ -9,6 +9,11 @@
 
 #include "network.h"
 
+/* constants to apply User-Agent header */
+#define LOGJAM_HOME_URL		"http://logjam.danga.com"
+#define LOGJAM_AUTHOR_EMAIL	"martine at danga.com"
+#define LOGJAM_USER_AGENT	LOGJAM_HOME_URL "; " LOGJAM_AUTHOR_EMAIL
+
 /* network-internal -- interface to http, used by network.
  * provides a blocking and nonblocking interface.
  * implemented by
diff --git a/src/network-libxml.c b/src/network-libxml.c
index 8f2c4d7..4f97737 100644
--- a/src/network-libxml.c
+++ b/src/network-libxml.c
@@ -25,6 +25,7 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 	gboolean success = FALSE;
 	int len;
 	NetStatusProgress progress;
+	gchar *user_agent;
 
 	if (conf.options.netdump && post) 
 		fprintf(stderr, _("Request: [%s]\n"), post->str);
@@ -44,16 +45,22 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		xmlNanoHTTPScanProxy(NULL);
 	}
 
+	user_agent = g_strdup_printf("User-Agent: %s\r\n", LOGJAM_USER_AGENT);
 	if (headers) {
 		GString *hs = g_string_new(NULL);
 		GSList *l;
+		g_string_append(hs, user_agent);
 		for (l = headers; l; l = l->next) {
 			g_string_append(hs, l->data);
 			g_string_append(hs, "\r\n");
 		}
 		headerstr = hs->str;
 		g_string_free(hs, FALSE);
+		g_free(user_agent);
+	} else {
+		headerstr = user_agent;
 	}
+
 	if (post)
 		ctx = xmlNanoHTTPMethod(url, "POST",
 				post->str, NULL, headerstr, post->len);
diff --git a/src/network-soup.c b/src/network-soup.c
index 9e28d9c..24b8e45 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -57,10 +57,13 @@ net_post_blocking(const char *url, GSList *headers, GString *post,
 		}
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_PROXY_URI, suri,
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
 			NULL);
 		soup_uri_free(suri);
 	} else
-		session = soup_session_sync_new ();
+		session = soup_session_sync_new_with_options (
+			SOUP_SESSION_USER_AGENT, LOGJAM_USER_AGENT,
+			NULL);
 
 	req = soup_message_new(post ? "POST" : "GET", url);
 	g_signal_connect(G_OBJECT(req), "got-chunk",
diff --git a/src/network-win32.c b/src/network-win32.c
index a2429aa..d4d1796 100644
--- a/src/network-win32.c
+++ b/src/network-win32.c
@@ -126,7 +126,7 @@ net_post_blocking(const char *surl, GSList *headers, GString *post,
 	host = urlc.lpszHostName;
 	host[urlc.dwHostNameLength] = 0;
 
-	if ((hInternet = InternetOpen("LogJam-Win32",
+	if ((hInternet = InternetOpen(LOGJAM_USER_AGENT,
 			INTERNET_OPEN_TYPE_PRECONFIG,
 			NULL, NULL, 0)) != NULL) {
 
-- 
1.6.4


0001-Adds-titles-to-links-and-images-and-link-to-images.patch:
 html_markup.c |    5 +++++
 imagelink.c   |   32 +++++++++++++++++++++++++++++---
 link.c        |   16 +++++++++++++---
 menu.c        |    6 +++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

--- NEW FILE 0001-Adds-titles-to-links-and-images-and-link-to-images.patch ---
>From 14038cb91ef71252d9e46c5c4f4060e79ee49259 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko at gmail.com>
Date: Fri, 1 May 2009 23:27:26 +0300
Subject: [PATCH] Adds titles to links and images and link to images

This adds:
* title to the dialog for image and link
* link to image dialog
* blockquote option for formatting

Originally patch was observed here:
http://bugzilla.redhat.com/show_bug.cgi?id=434754#c1

Signed-off-by: Andy Shevchenko <andy.shevchenko at gmail.com>
---
 src/html_markup.c |    5 +++++
 src/imagelink.c   |   32 +++++++++++++++++++++++++++++---
 src/link.c        |   16 +++++++++++++---
 src/menu.c        |    5 +++++
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/html_markup.c b/src/html_markup.c
index 36ec4e7..9c5a796 100644
--- a/src/html_markup.c
+++ b/src/html_markup.c
@@ -74,3 +74,8 @@ void
 html_mark_monospaced(JamDoc *doc) {
 	html_mark_tag(doc, "tt");
 }
+
+void
+html_mark_blockquote(JamDoc *doc) {
+	html_mark_tag(doc, "blockquote");
+}
diff --git a/src/imagelink.c b/src/imagelink.c
index a9f296d..21ac938 100644
--- a/src/imagelink.c
+++ b/src/imagelink.c
@@ -13,7 +13,7 @@
 
 typedef struct {
 	GtkWidget *dlg;
-	GtkWidget *url, *get, *width, *height;
+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
 } ImageDlg;
 
 static void
@@ -88,6 +88,14 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
 			FALSE, FALSE, 0);
 
+	idlg->tit = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
+		FALSE, FALSE, 0);
+	idlg->anchor = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(vbox),
+		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
+		FALSE, FALSE, 0);
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	dimbox = gtk_vbox_new(FALSE, 6);
@@ -132,6 +140,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
 	char *sel = NULL, *url = NULL;
+	const gchar *tit, *anch;
 	const char *data;
 	int width = -1, height = -1;
 
@@ -161,9 +170,15 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 
 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
 		xml_escape(&url);
-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
+		anch = gtk_entry_get_text(GTK_ENTRY(idlg->anchor));
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, anch, -1);
+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
+		}
+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
 		gtk_text_buffer_insert(buffer, &start, url, -1);
-		gtk_text_buffer_insert(buffer, &start, "'", -1);
+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
 		g_free(url);
 
 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
@@ -182,7 +197,18 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
 			gtk_text_buffer_insert(buffer, &start, data, -1);
 			g_free(data);
 		}
+
+		tit = gtk_entry_get_text(GTK_ENTRY(idlg->tit));
+		if (tit && *tit) {
+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
+			gtk_text_buffer_insert(buffer, &start, tit, -1);
+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
+		}
+
 		gtk_text_buffer_insert(buffer, &start, " />", -1);
+		if (anch && *anch) {
+			gtk_text_buffer_insert(buffer, &start, "</a>", -1);
+		}
 	}
 
 	g_free(sel);
diff --git a/src/link.c b/src/link.c
index 0be2e98..596eb30 100644
--- a/src/link.c
+++ b/src/link.c
@@ -17,6 +17,7 @@
 typedef struct {
 	GtkWidget *dlg;
 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
+	GtkWidget *titl;
 	JamDoc *doc;
 	gint sel_type, clip_type;
 	gchar *sel_input, *clip_input;
@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
 static void
 make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	GtkWidget *vbox;
-	GtkWidget *subbox;
+	GtkWidget *subbox, *hhr;
 	GSList *rgroup;
 
 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
@@ -114,6 +115,9 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
+	ld->titl = gtk_entry_new();
+	hhr = labelled_box_new(_("Link Title:"), ld->titl);
+	gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), 
 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
 
 static char*
 get_link(LinkDialog *ld, JamAccount *acc) {
-	char *url, *user, *text;
+	char *url, *user, *text, *title;
 	char *link = NULL;
 
 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
@@ -187,10 +191,15 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	xml_escape(&user);
 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
 	xml_escape(&text);
+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
 		/* build a "url" link. */
-		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		if (title && *title) {
+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
+		} else {
+			link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
+		}
 	} else if (ld->ruser &&
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
 		/* build a "friends" link. */
@@ -204,6 +213,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
 	g_free(url);
 	g_free(user);
 	g_free(text);
+	g_free(title);
 	
 	return link;
 }
diff --git a/src/menu.c b/src/menu.c
index 7fa74f2..5cdd37e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -321,6 +321,10 @@ static void
 menu_html_mark_monospaced(JamWin *jw) {
 	html_mark_monospaced(jw->doc);
 }
+static void
+menu_html_mark_blockquote(JamWin *jw) {
+	html_mark_blockquote(jw->doc);
+}
 
 void manager_dialog(GtkWidget *parent);
 
@@ -435,6 +439,7 @@ static GtkItemFactoryEntry menu_items[] = {
 { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
 { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
 { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
+{ N_("/HTML/_Blockquote"),			"<ctl><alt>Q", menu_html_mark_blockquote },
 
 { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
 { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },
-- 
1.6.4


logjam-4.5.3-tags.patch:
 protocol/liblivejournal/livejournal/Makefile.am   |    3 
 protocol/liblivejournal/livejournal/gettags.c     |   65 +++++++
 protocol/liblivejournal/livejournal/gettags.h     |   16 +
 protocol/liblivejournal/livejournal/livejournal.h |    1 
 protocol/liblivejournal/livejournal/tags.h        |   18 ++
 protocol/liblivejournal/livejournal/types.c       |   13 +
 src/Makefile.am                                   |    1 
 src/jamview.c                                     |   24 ++
 src/tags.c                                        |  181 ++++++++++++++++++++++
 src/tags.h                                        |    6 
 10 files changed, 327 insertions(+), 1 deletion(-)

Index: logjam-4.5.3-tags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-10/logjam-4.5.3-tags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- logjam-4.5.3-tags.patch	11 Mar 2008 21:58:59 -0000	1.4
+++ logjam-4.5.3-tags.patch	24 Aug 2009 16:31:03 -0000	1.5
@@ -169,52 +169,6 @@ diff -up /dev/null logjam-4.5.3/protocol
 +	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 17:53:46.000000000 -0400
@@ -421,26 +375,6 @@ diff -up logjam-4.5.3/src/Makefile.am.ta
            $(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 17:53:46.000000000 -0400
 +++ logjam-4.5.3/src/jamview.c	2008-03-11 17:53:46.000000000 -0400


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-10/logjam.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- logjam.spec	27 Apr 2009 21:38:34 -0000	1.53
+++ logjam.spec	24 Aug 2009 16:31:03 -0000	1.54
@@ -2,13 +2,18 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	33%{?dist}
+Release:	36%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
 Group:		User Interface/Desktops
 URL:		http://logjam.danga.com/
-Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+#Source0:	http://logjam.danga.com/download/logjam-%{version}.tar.bz2
+# Now, we get source from git
+# git clone git://github.com/martine/LogJam.git logjam-git
+# find logjam-git -depth -name .git -type d -exec rm -rf {} \;
+# tar cvfj logjam-git-20090824.tar.bz2 logjam-git/
+Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -17,34 +22,30 @@ BuildRequires:	curl-devel, gtk2-devel, g
 BuildRequires:	gettext, desktop-file-utils, aspell-devel, librsvg2-devel
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 BuildRequires:	autoconf, automake, libtool, intltool, popt-devel, m4
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-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.3-gtkhtml314.patch
-Patch7:		logjam-4.4.1-ru.po.asp.patch
-Patch8:		logjam-4.5.3-gtkspell.patch
-Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
-Patch10:	logjam-4.5.3-rhythmbox-fix.patch
-Patch11:	logjam-libsoup24.diff
-Patch12:	logjam-4.5.3-disable-threads.patch
-Patch13:	logjam-title.patch
-Patch14:	logjam-4.5.3-tags.patch
-Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
-Patch16:	logjam-4.5.3-start_in_dock.patch
-Patch17:	logjam-4.5.3-uk.po.patch
-Patch18:	logjam-4.5.3-no_quit_when_docked.patch
-Patch19:	logjam-4.5.3-close_when_send.patch
-Patch20:	logjam-4.5.3-imageresize.patch
-Patch21:	logjam-4.5.3-showloginhistory.patch
-Patch22:	logjam-4.5.3-libtool.patch
-Patch23:	logjam-4.5.3-keep-drafts.patch
-Patch24:	logjam-4.5.3-lj-embed.patch
-Patch25:	logjam-4.5.3-mpris.diff
-Patch26:	logjam-4.5.3-save-tags.diff
+Patch1:		logjam-4.4.1-fedora-desktop.patch
+Patch2:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
+Patch3:		logjam-4.5.3-disable-threads.patch
+Patch4:		0001-Adds-titles-to-links-and-images-and-link-to-images.patch
+Patch5:		logjam-4.5.3-tags.patch
+Patch6:		logjam-4.5.3-start_in_dock.patch
+Patch7:		logjam-4.5.3-no_quit_when_docked.patch
+Patch8:		logjam-4.5.3-close_when_send.patch
+Patch9:		logjam-4.5.3-showloginhistory.patch
+Patch10:	logjam-4.5.3-libtool.patch
+Patch11:	logjam-4.5.3-keep-drafts.patch
+Patch12:	logjam-4.5.3-mpris.diff
+Patch13:	logjam-4.5.3-save-tags.diff
+# From: http://github.com/andy-shev/LogJam/commit/1426ae5af7f0c1ba4084f0ce0e0b63c43c763dc7
+Patch14:	0001-Add-support-of-the-User-Agent-header.patch
+# From: http://github.com/andy-shev/LogJam/commit/7ab07309963ac85c42ab7f235ac39189091a2718
+Patch15:	0001-Add-Location-support-to-the-logjam.patch
+# From: http://github.com/andy-shev/LogJam/commit/43ff911da0f0d81a264bc52e8db565e0fb52c2af
+Patch16:	0001-Add-possibility-to-insert-link-by-nickname.patch
+# From: http://github.com/andy-shev/LogJam/commit/bbe8da1dd21a193d232e6b63ed37cb30ea2068ca
+Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -62,34 +63,27 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q
-%patch2 -p1 -b .backdated
-%patch3 -p1 -b .cleanups
-%patch4 -p1 -b .desktop
-%patch5 -p1 -b .manfix
-%patch6 -p1 -b .gtkhtml314
-%patch7 -p1 -b .ru.po
-%patch8 -p1 -b .bz186906
-%patch9 -p1 -b .docklet-context-menu
-%patch10 -p1 -b .rhythmboxfix
-%patch11 -p1 -b .libsoup
-%patch12 -p1 -b .disable-threads
-%patch13 -p1 -b .title
-%patch14 -p1 -b .tags
-%patch15 -p1 -b .default-spelllang-en-US
-%patch16 -p1 -b .start-in-dock
-%patch17 -p1 -b .uk.po
-%patch18 -p1 -b .no_quit_when_docked
-%patch19 -p1 -b .close_when_send
-%patch20 -p1 -b .imageresize
-%patch21 -p1 -b .showloginhistory
+%setup -q -n logjam-git
+%patch1 -p1 -b .desktop
+# %%patch5 -p1 -b .manfix
+%patch2 -p1 -b .docklet-context-menu
+%patch3 -p1 -b .disable-threads
+%patch4 -p1 -b .title
+%patch5 -p1 -b .tags
+%patch6 -p1 -b .start-in-dock
+%patch7 -p1 -b .no_quit_when_docked
+%patch8 -p1 -b .close_when_send
+%patch9 -p1 -b .showloginhistory
 %if 0%{fedora} >= 11
-%patch22 -p1 -b .libtool
+%patch10 -p1 -b .libtool
 %endif
-%patch23 -p1 -b .keep_drafts
-%patch24 -p1 -b .lj-embed
-%patch25 -p1 -b .mpris
-%patch26 -p1 -b .save-tags
+%patch11 -p1 -b .keep_drafts
+%patch12 -p1 -b .mpris
+%patch13 -p1 -b .save-tags
+%patch14 -p1 -b .user-agent
+%patch15 -p1 -b .location
+%patch16 -p1 -b .link-by-nickname
+%patch17 -p1 -b .automake111
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -100,9 +94,8 @@ intltoolize --force
 
 %build
 touch NEWS README AUTHORS
-aclocal
-autoconf
-automake --add-missing
+# Passing NOCONFIGURE=true keeps configure from running.
+NOCONFIGURE=true ./autogen.sh
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -143,6 +136,19 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 24 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-36
+- use properly formed user-agent string (Andy Shevchenko) (bz 518757)
+- rebase to git master (bz 518758)
+- Add Location support (Andy Shevchenko, from Ubuntu)
+- Add link-by-nickname support (Andy Shevchenko, from FreeBSD)
+- clean out merged patches
+
+* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:4.5.3-35
+- Convert specfile to UTF-8.
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.5.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-33
 - conditionalize libtool fun for F10+
 
@@ -400,5 +406,5 @@ rm -rf $RPM_BUILD_ROOT
  - Added fix for James Manning, Web Links browser launch
 * Tue Feb 13 2001 Tom "spot" Callaway <tcallawa at redhat.com>
  - Upgraded to add GNOME build option.
-* Sun Oct 08 2000 Alexander Gräfe <nachtfalke at retrogra.de>
+* Sun Oct 08 2000 Alexander Gräfe <nachtfalke at retrogra.de>
  - inital version of the RPM.

More information about the fedora-extras-commits mailing list