[gwibber/f13] add support for Sina, Catch errors trying to get Oauth tokendata from Twitter (bz 702940, 700960), D

[Tom Callaway]

commit 99e1c9c96d7e45f219be6e01451b4a7d35c48629
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu May 12 15:03:21 2011 -0400

    add support for Sina, Catch errors trying to get Oauth tokendata from Twitter (bz 702940, 700960), Do not try to process an empty message (bz 702880), Improve about-dialog handling (bz 700878), Catch and log sqlite errors (bz 702992 678015 699139 698074 700966)

 gwibber.spec |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 deletions(-)
---
diff --git a/gwibber.spec b/gwibber.spec
index 35e3d85..4120de8 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -4,7 +4,7 @@
 
 Name:           gwibber
 Version:        3.0.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 Group:          Applications/Internet
@@ -16,7 +16,6 @@ URL:            https://launchpad.net/gwibber
 #   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/trunk/3.0/+download/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Fix situation where pango_overlay can be undefined
 # https://bugs.launchpad.net/gwibber/+bug/577050
@@ -61,6 +60,22 @@ Patch40:	gwibber-3.0.0-gowalla.patch
 Patch41:	gwibber-2.91.92-gowalla-icons.patch
 Patch42:	gwibber-2.91.92-gowalla-kitchen.patch
 
+# Sina support
+Patch43:	gwibber-3.0.0.1-sina.patch
+Patch44:	gwibber-3.0.0.1-sina-icons.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.0.0.1-sqlite-catch_error.patch
+
 Requires:	libsoup, python-pycurl
 Requires:	python 
 Requires:	dbus-python >= 0.80.2
@@ -115,6 +130,22 @@ and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, and Digg.
 %patch41 -p1 -b .gowalla-icons
 %patch42 -p1 -b .gowalla-kitchen
 
+# 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
+
 # sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
 
 %build
@@ -122,13 +153,18 @@ and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, and Digg.
 
 
 %install
-rm -rf %{buildroot}
 %{__python} setup.py install --prefix %{_prefix} -O1 --skip-build --root %{buildroot}
 
 # Clean up patchfiles
 for i in `find %{buildroot} |grep "\.gowalla"`; do
 	rm -f $i
 done
+for i in `find %{buildroot} |grep "\.sina"`; do
+	rm -f $i
+done
+for i in `find %{buildroot} |grep "\.catch_error"`; do
+	rm -f $i
+done
 
 ## Reinstall .desktop file
 rm -rf %{buildroot}%{_datadir}/applications
@@ -139,12 +175,7 @@ cp -a build/mo %{buildroot}%{_datadir}/locale
 %find_lang %{name}
 
  
-%clean
-rm -rf %{buildroot}
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}-*.egg-info
@@ -166,6 +197,13 @@ rm -rf %{buildroot}
 %{_datadir}/indicators/messages/applications/gwibber
 
 %changelog
+* Thu May 12 2011 Tom Callaway <spot at fedoraproject.org> - 1:3.0.0.1-2
+- add support for Sina
+- Catch errors trying to get Oauth tokendata from Twitter (bz 702940, 700960)
+- Do not try to	process	an empty message (bz 702880)
+- Improve about-dialog handling (bz 700878)
+- Catch and log sqlite errors (bz 702992 678015	699139 698074 700966)
+
 * Tue Apr 26 2011 Tom Callaway <spot at fedoraproject.org> - 1:3.0.0.1-1
 - update to 3.0.0.1