[gwibber/f17] 3.4.2

Tom Callaway spot at fedoraproject.org
Wed Jul 11 15:23:22 UTC 2012


commit aba6271a34aa22759b52ae0451bd5b17c4a9ffc5
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Jul 11 11:23:45 2012 -0400

    3.4.2

 gwibber-3.4.2-fix-twitter-oauth.patch |   15 +++++++
 gwibber-3.4.2-undefined-mark.patch    |   12 ++++++
 gwibber.spec                          |   68 ++++----------------------------
 sources                               |    2 +-
 4 files changed, 37 insertions(+), 60 deletions(-)
---
diff --git a/gwibber-3.4.2-fix-twitter-oauth.patch b/gwibber-3.4.2-fix-twitter-oauth.patch
new file mode 100644
index 0000000..8065c95
--- /dev/null
+++ b/gwibber-3.4.2-fix-twitter-oauth.patch
@@ -0,0 +1,15 @@
+diff -up gwibber-3.4.2/gwibber/microblog/util/const.py.in.fedora-twitter gwibber-3.4.2/gwibber/microblog/util/const.py.in
+--- gwibber-3.4.2/gwibber/microblog/util/const.py.in.fedora-twitter	2012-07-11 11:09:44.000000000 -0400
++++ gwibber-3.4.2/gwibber/microblog/util/const.py.in	2012-07-11 11:10:18.559090579 -0400
+@@ -12,8 +12,9 @@ if environ.has_key("FB_APP_KEY"):
+ else:
+   FB_APP_KEY = "1e51e9b88c054048dc201f81ea5543b7"
+ 
+-TWITTER_OAUTH_KEY = "qMBra1U4bpNYvDz947M5Q"
+-TWITTER_OAUTH_SECRET = "Lzdkhg0WvGYFzD9tnsuwC0zYmpJ4z7HrZl3yOxU1g"
++TWITTER_OAUTH_KEY = "GDbYbywyvbcPfe26MqrifQ"
++TWITTER_OAUTH_SECRET = "U4C34CzUW6YYNFinX8RjSTsWWn2bWX08WVdFsxyQ"
++
+ 
+ # Gwibber
+ MAX_MESSAGE_LENGTH = 140
diff --git a/gwibber-3.4.2-undefined-mark.patch b/gwibber-3.4.2-undefined-mark.patch
new file mode 100644
index 0000000..8522e01
--- /dev/null
+++ b/gwibber-3.4.2-undefined-mark.patch
@@ -0,0 +1,12 @@
+diff -up gwibber-3.4.2/gwibber/lib/gtk/widgets.py.missing-mark gwibber-3.4.2/gwibber/lib/gtk/widgets.py
+--- gwibber-3.4.2/gwibber/lib/gtk/widgets.py.missing-mark	2012-07-11 11:00:09.882081446 -0400
++++ gwibber-3.4.2/gwibber/lib/gtk/widgets.py	2012-07-11 11:00:29.827081745 -0400
+@@ -257,7 +257,7 @@ class InputTextView(Gtk.TextView):
+           buf.insert(iter_start, ("%s " % shortened_url))
+       def error_shortened(dbus_exc):
+           "Internal shortening-url-died function: a closure"
+-          iter = buf.get_iter_at_mark(mark)
++          iter = buf.get_iter_at_mark(mark_start)
+           buf.insert(iter, text) # shortening failed
+ 
+       # set a mark at iter, so that the callback knows where to insert
diff --git a/gwibber.spec b/gwibber.spec
index ffb400f..f090627 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gwibber
-Version:        3.3.2
+Version:        3.4.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
@@ -13,54 +13,27 @@ URL:            https://launchpad.net/gwibber
 # following command to generate the tarball:
 #   bzr export -r %{bzr_rev} gwibber-%{bzr_rev}bzr.tar.gz lp:gwibber
 # Source0:        %{name}-%{bzr_rev}bzr.tar.gz
-Source0:	http://launchpad.net/gwibber/3.4/3.3.1.1/+download/%{name}-%{version}.tar.gz
+Source0:	https://launchpad.net/gwibber/3.4/3.4.2/+download/%{name}-%{version}.tar.gz
 
 # Fix situation where pango_overlay can be undefined
 # https://bugs.launchpad.net/gwibber/+bug/577050
 Patch1:		gwibber-865bzr-undefined.patch
 
-# Disable libproxy support
-# It doesn't work for some unknown reason.
-Patch2:		gwibber-2.91.92-no-libproxy.patch
-
-# Handle \x00 if it shows up in our content string
-# bz 630944 & 620170
-# https://bugs.launchpad.net/gwibber/+bug/647049
-Patch3:		gwibber-2.91.92-handle-x00-in-content.patch
-
 # Oauth bits
 Patch6:		gwibber-832bzr-twitter-oauth.patch
 
 # Fix iter call to non-existent "mark", use "mark_start"
 # bz635345 bz623754
-Patch11:	gwibber-3.1.0-undefined-mark.patch
-
-# Use kitchen to force all strings generated by microblog inputs to unicode
-Patch13:	gwibber-3.3.1.1-kitchen-unicode.patch
+Patch11:	gwibber-3.4.2-undefined-mark.patch
 
 # Facebook Fedora key
 Patch15:	gwibber-3.3.1.1-facebook-fedora.patch
 
-# Sina support
-Patch43:	gwibber-3.3.1.1-sina.patch
-Patch44:	gwibber-3.1.2-sina-icons.patch
-# TODO
-# Kitchen patch
-
 # Catch errors trying to get Twitter Oauth token
 Patch45:	gwibber-3.0.0.1-twitter-catch_error.patch
 
-# Don't try to process empty message (bz 702880)
-Patch46:	gwibber-3.0.0.1-empty_msg.patch
-
-# Improve about-dialog handling (bz 700878)
-Patch47:	gwibber-3.0.0.1-improve-about-dialog-handling.patch
-
-# Catch sqlite errors (bz 702992 678015 699139 698074 700966)
-Patch48:	gwibber-3.3.1.1-sqlite-catch_error.patch
-
 # Overwrite default oauth key
-Patch49:	gwibber-3.3.1.1-fix-twitter-oauth.patch
+Patch49:	gwibber-3.4.2-fix-twitter-oauth.patch
 
 # No unity here, sorry.
 Patch51:	gwibber-3.3.1.1-no-unity.patch
@@ -71,9 +44,6 @@ Patch52:	gwibber-3.3.2-no-gtkspell.patch
 # Gee now reports API of 0.8 in the 0.7 releases.
 Patch53:	gwibber-3.3.2-gee-0.8.patch
 
-# Fixes for valac-0.16
-Patch54:	gwibber-3.3.2-valac-0.16.patch
-
 Requires:	libsoup, python-pycurl
 Requires:	python 
 Requires:	dbus-python >= 0.80.2
@@ -92,7 +62,8 @@ Requires:       gnome-python2-gnomekeyring
 Requires:       python-oauth
 Requires:	gnome-python2-libwnck
 Requires:	gnome-python2-gtkspell
-Requires:	python-kitchen
+Requires:	python-httplib2
+# Requires:	python-kitchen
 BuildRequires:  python-devel, desktop-file-utils, python-distutils-extra, intltool, gettext, vala
 BuildRequires:	gsettings-desktop-schemas-devel, json-glib-devel, libnotify-devel, dee-devel >= 1.0.0
 BuildRequires:	libgee-devel, pango-devel, glib2-devel, gtk3-devel, libsoup-devel, gobject-introspection-devel
@@ -104,8 +75,7 @@ BuildRequires:	gnome-common
 
 %description
 Gwibber is an open source microblogging client for GNOME developed with Python
-and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, Sina, Buzz 
-and Digg.
+and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, Buzz, and Digg.
 
 %package devel
 Summary:	Development files for gwibber's libraries
@@ -119,33 +89,16 @@ Development files for gwibber's libraries.
 %prep
 %setup -q
 
-%patch1 -p1 -b .undefined
-%patch2 -p1 -b .no-libproxy
-%patch3 -p1 -b .x00
+# %patch1 -p1 -b .undefined
 
 %patch6 -p1 -b .oauth
 
 %patch11 -p1 -b .missing-mark
 
-%patch13 -p1 -b .kitchen
-
 %patch15 -p1 -b .fedora
 
-# Sina
-%patch43 -p1 -b .sina
-%patch44 -p1 -b .sina-icons
-
 # Catch errors trying to get Oauth tokendata from Twitter
-%patch45 -p1 -b .catch_error
-
-# Do not try to process an empty message (bz 702880)
-%patch46 -p1 -b .empty_msg
-
-# Improve about-dialog handling (bz700878)
-%patch47 -p1 -b .improve-about-dialog-handling
-
-# Catch sqlite errors (bz 702992 678015	699139 698074 700966)
-%patch48 -p1 -b .catch_sqlite_error
+# %patch45 -p1 -b .catch_error
 
 # Overwrite default oauth key for twitter
 %patch49 -p1 -b .fedora-twitter
@@ -159,9 +112,6 @@ Development files for gwibber's libraries.
 # Match with 0.7 API (of 0.8)
 %patch53 -p1 -b .gee08
 
-# Don't hardcode a version of valac
-%patch54 -p0 -b .valac-0.16
-
 %build
 NOCONFIGURE=true ./autogen.sh
 %configure --disable-unity --disable-static --disable-spell
diff --git a/sources b/sources
index 5f12e4c..d3a4b44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47a15990fb3b27bc1ef6b953b9b26022  gwibber-3.3.2.tar.gz
+0ac544f8e626547312b9d0da0b57358e  gwibber-3.4.2.tar.gz


More information about the scm-commits mailing list