[logjam] update to 4.6.0

[Tom Callaway]

commit f25d5b76714328ab7f0fe707bc87795ac72b5096
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Nov 29 16:13:07 2010 -0500

    update to 4.6.0

 .gitignore  |    1 +
 logjam.spec |   75 +++++++---------------------------------------------------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44b4264..68b00bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 logjam-git-20090824.tar.bz2
+/andy-shev-LogJam-v4.6.0-0-geae69a9.tar.gz
diff --git a/logjam.spec b/logjam.spec
index 6a4c275..d755818 100644
--- a/logjam.spec
+++ b/logjam.spec
@@ -1,19 +1,19 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.3
-Release:	39%{?dist}
+Version:	4.6.0
+Release:	1%{?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
-# Now, we get source from git
+Source0:	http://download.github.com/andy-shev-LogJam-v%{version}-0-geae69a9.tar.gz
+# Alternately, we sometimes 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
+# Source0:	logjam-git-20090824.tar.bz2
 Requires:	curl >= 7.9, gtkspell
 %if %{use_xmms}
 BuildRequires:	xmms-devel
@@ -26,41 +26,6 @@ BuildRequires:	dbus-devel, dbus-glib-devel, perl(YAML)
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1:		logjam-4.4.1-fedora-desktop.patch
-# From: http://github.com/andy-shev/LogJam/commit/7e6f867b0bbef8ea139d895a8915d6ec93c1cbe7
-Patch2:		0001-Add-context-menu-support-in-the-dock-v2.patch
-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
-# From: http://github.com/andy-shev/LogJam/commit/615b08e85e121433b518c497a82164ebcaa0d171
-Patch12:	0001-Add-MPRIS-support-to-detect-current-music-v2.patch
-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/90f888a78488448961516f218fd1168faa5156be
-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
-# Fix implicit DSO linking issue
-Patch18:	logjam-4.5.3-fix-implicit-DSO.patch
-# From: http://github.com/andy-shev/LogJam/commit/b500b3995295f728a52cec2b7299130a828e2fcf
-Patch19:	logjam-4.5.3-fix-MusicSource.patch
-# From: http://github.com/andy-shev/LogJam/commit/390ae66557b05f9c6fec9d2d3ad361f83d42f36a
-Patch20:	logjam-4.5.3-bansheeclient.patch
-# From: http://github.com/andy-shev/LogJam/commit/1f14bfd1842ab633fe17303d8802c2e5de34f18d
-Patch21:	logjam-4.5.3-bz590291.patch
-# From: http://github.com/andy-shev/LogJam/commit/bdca85ee5a26f7eee83ec811b3f0761fbf2fda77
-# Also includes entry for Chromium (as opposed to Google Chrome)
-Patch22:	logjam-4.5.3-extendURLopener.patch
-# From: http://github.com/andy-shev/LogJam/commit/9bd2b18b15a7aa3ab0d0156e190d490892484c2f
-Patch23:	logjam-4.5.3-twuser.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -78,33 +43,8 @@ current music from XMMS.
 %endif
 
 %prep
-%setup -q -n logjam-git
+%setup -q -n andy-shev-LogJam-7065af5
 %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
-%patch10 -p1 -b .libtool
-%endif
-%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
-%patch18 -p1 -b .DSO
-%patch19 -p1 -b .fixMusicSource
-%patch20 -p1 -b .bansheeclient
-%patch21 -p1 -b .bz590291
-%patch22 -p1 -b .extendURLopener
-%patch23 -p1 -b .twuser
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -158,6 +98,9 @@ desktop-file-install --vendor fedora                    \
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Nov 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.6.0-1
+- update to 4.6.0
+
 * Fri Jul  9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-39
 - clean up MusicSource list, add banshee detection (Andy Shevchenko) (bz 574254)
 - fix situation where outdated information is in logjam when 'last login' 
diff --git a/sources b/sources
index e4654e6..9f88600 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aebe99f64fa31fdf5e83ed55d319e76a  logjam-git-20090824.tar.bz2
+e7acc34bb828670d2c2196d077e05e6a  andy-shev-LogJam-v4.6.0-0-geae69a9.tar.gz