rpms/gwibber/F-9 gwibber-system-simplejson.patch, NONE, 1.1 gwibber.spec, 1.3, 1.4
Jeffrey C. Ollie
jcollie at fedoraproject.org
Sat Nov 1 21:11:23 UTC 2008
- Previous message: [pkgdb] kchmviewer had acl change status
- Next message: rpms/pyroom/devel .cvsignore, 1.2, 1.3 pyroom.spec, 1.1, 1.2 sources, 1.2, 1.3 pyroom, 1.1, NONE pyroom.desktop, 1.1, NONE test, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/gwibber/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32107
Modified Files:
gwibber.spec
Added Files:
gwibber-system-simplejson.patch
Log Message:
* Thu Oct 2 2008 Jeremy Katz <katzj at redhat.com> - 0.7-6.102bzr
- Use the system python-simplejson rather than the one included in the
tarball (#464727)
gwibber-system-simplejson.patch:
--- NEW FILE gwibber-system-simplejson.patch ---
diff -ur gwibber-102/gwibber/gwui.py gwibber/gwibber/gwui.py
--- gwibber-102/gwibber/gwui.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/gwui.py 2008-10-02 21:41:05.000000000 -0400
@@ -8,6 +8,7 @@
import webkit, gintegration, microblog
import urllib2, hashlib, time, os
+import simplejson
DEFAULT_UPDATE_INTERVAL = 1000 * 60 * 5
IMG_CACHE_DIR = "%s/.gwibber/imgcache" % os.path.expanduser("~")
@@ -36,7 +37,7 @@
def add(self, message):
message.message_index = len(self.messages)
self.messages += [message]
- self.execute_script("addMessage(%s)" % microblog.support.simplejson.dumps(
+ self.execute_script("addMessage(%s)" % simplejson.dumps(
message.__dict__, indent=4, default=str))
def clear(self):
diff -ur gwibber-102/gwibber/microblog/digg.py gwibber/gwibber/microblog/digg.py
--- gwibber-102/gwibber/microblog/digg.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/digg.py 2008-10-02 21:41:23.000000000 -0400
@@ -6,6 +6,7 @@
import urllib2, urllib, support, re
from xml.dom import minidom
+import simplejson
CONFIG = ["message_color", "comment_color", "username", "receive_enabled"]
LINK_PARSE = re.compile("<a[^>]+href=\"(https?://[^\"]+)\">[^<]+</a>")
@@ -38,7 +39,7 @@
data.getElementsByTagName("title")[0].firstChild.nodeValue)
self.bgcolor = "digg_color"
- self.diggs = support.simplejson.loads(urllib2.urlopen(urllib2.Request(
+ self.diggs = simplejson.loads(urllib2.urlopen(urllib2.Request(
"http://services.digg.com/story/%s?appkey=http://cixar.com&type=json" %
self.url.split("/")[-1])).read())["stories"][0]["diggs"]
diff -ur gwibber-102/gwibber/microblog/flickr.py gwibber/gwibber/microblog/flickr.py
--- gwibber-102/gwibber/microblog/flickr.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/flickr.py 2008-10-02 21:41:35.000000000 -0400
@@ -5,6 +5,7 @@
"""
import urllib2, urllib, support, mx.DateTime
+import simplejson
CONFIG = ["message_color", "username", "receive_enabled", "send_enabled"]
@@ -52,7 +53,7 @@
return urllib2.urlopen(urllib2.Request(url, data)).read()
def restcall(self, method, args):
- return support.simplejson.loads(self.connect(
+ return simplejson.loads(self.connect(
"%s/?api_key=%s&format=json&nojsoncallback=1&method=%s&%s" % (
REST_SERVER, API_KEY, method, urllib.urlencode(args))))
diff -ur gwibber-102/gwibber/microblog/identica.py gwibber/gwibber/microblog/identica.py
--- gwibber-102/gwibber/microblog/identica.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/identica.py 2008-10-02 21:41:45.000000000 -0400
@@ -7,6 +7,7 @@
"""
import urllib2, urllib, base64, re, support
+import simplejson
CONFIG = ["message_color", "password", "username", "receive_enabled", "send_enabled"]
NICK_PARSE = re.compile("@([A-Za-z0-9]+)")
@@ -57,7 +58,7 @@
url, data, {"Authorization": self.get_auth()})).read()
def get_data(self):
- return support.simplejson.loads(self.connect(
+ return simplejson.loads(self.connect(
"http://identi.ca/api/statuses/friends_timeline.json"))
def get_messages(self):
diff -ur gwibber-102/gwibber/microblog/jaiku.py gwibber/gwibber/microblog/jaiku.py
--- gwibber-102/gwibber/microblog/jaiku.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/jaiku.py 2008-10-02 21:41:58.000000000 -0400
@@ -7,6 +7,7 @@
"""
import urllib2, urllib, support, re
+import simplejson
CONFIG = ["message_color", "comment_color", "password", "username", "receive_enabled", "send_enabled"]
NONCE_PARSE = re.compile('.*_nonce" value="([^"]+)".*', re.M | re.S)
@@ -56,13 +57,13 @@
self.account["password"] != None
def get_data(self):
- return support.simplejson.loads(urllib2.urlopen(urllib2.Request(
+ return simplejson.loads(urllib2.urlopen(urllib2.Request(
"http://%s.jaiku.com/contacts/feed/json" % self.account["username"],
urllib.urlencode({"user": self.account["username"],
"personal_key":self.account["password"]}))).read())
def get_reply_data(self, msg):
- return support.simplejson.loads(urllib2.urlopen(urllib2.Request(
+ return simplejson.loads(urllib2.urlopen(urllib2.Request(
"http://%s.jaiku.com/presence/%s/json" % (msg.sender_nick, msg.id),
urllib.urlencode({"user": self.account["username"],
"personal_key":self.account["password"]}))).read())
diff -ur gwibber-102/gwibber/microblog/pownce.py gwibber/gwibber/microblog/pownce.py
--- gwibber-102/gwibber/microblog/pownce.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/pownce.py 2008-10-02 21:42:05.000000000 -0400
@@ -7,6 +7,7 @@
"""
import urllib2, urllib, base64, support, mx.DateTime
+import simplejson
CONFIG = ["message_color", "comment_color", "password", "username", "receive_enabled", "send_enabled"]
API_KEY = "w5t07ju7t1072o1wfx8l9012a51fdabq"
@@ -62,7 +63,7 @@
url, data, {"Authorization": self.get_auth()})).read()
def get_reply_data(self, msg):
- return support.simplejson.loads(self.connect(
+ return simplejson.loads(self.connect(
"http://api.pownce.com/2.0/notes/%s.json?app_key=%s&show_replies=true" % (msg.id, API_KEY)))
def get_replies(self, msg):
Only in gwibber-102/gwibber/microblog/support: simplejson
diff -ur gwibber-102/gwibber/microblog/twitter.py gwibber/gwibber/microblog/twitter.py
--- gwibber-102/gwibber/microblog/twitter.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/gwibber/microblog/twitter.py 2008-10-02 21:42:13.000000000 -0400
@@ -7,6 +7,7 @@
"""
import urllib2, urllib, base64, re, support
+import simplejson
CONFIG = ["message_color", "password", "username", "receive_enabled", "send_enabled"]
NICK_PARSE = re.compile("@([A-Za-z0-9]+)")
@@ -57,7 +58,7 @@
url, data, {"Authorization": self.get_auth()})).read()
def get_data(self):
- return support.simplejson.loads(self.connect(
+ return simplejson.loads(self.connect(
"http://twitter.com/statuses/friends_timeline.json"))
def get_messages(self):
diff -ur gwibber-102/setup.py gwibber/setup.py
--- gwibber-102/setup.py 2008-09-11 19:36:15.000000000 -0400
+++ gwibber/setup.py 2008-10-02 21:42:55.000000000 -0400
@@ -11,7 +11,7 @@
author_email="segphault at arstechnica.com",
url="http://cixar.com/~segphault",
license="GNU General Public License (GPL)",
- packages=['gwibber', 'gwibber.microblog', 'gwibber.microblog.support', 'gwibber.microblog.support.simplejson'],
+ packages=['gwibber', 'gwibber.microblog', 'gwibber.microblog.support'],
data_files=[
('share/gwibber/ui/', glob("ui/*.glade")),
('share/gwibber/ui/', glob("ui/*.png")),
Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-9/gwibber.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gwibber.spec 30 Sep 2008 04:31:03 -0000 1.3
+++ gwibber.spec 1 Nov 2008 21:10:53 -0000 1.4
@@ -4,7 +4,7 @@
Name: gwibber
Version: 0.7
-Release: 5.%{bzr_rev}bzr%{?dist}
+Release: 6.%{bzr_rev}bzr%{?dist}
Summary: An open source microblogging client for GNOME developed with Python and GTK
Group: Applications/Internet
@@ -15,6 +15,7 @@
# bzr branch -r %{bzr_rev} lp:gwibber
# tar -czvf gwibber-%{bzr_rev}bzr.tar.gz gwibber
Source0: %{name}-%{bzr_rev}bzr.tar.gz
+Patch0: gwibber-system-simplejson.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: python pygtk2 dbus-python gnome-python2-gconf PyXML pywebkitgtk mx
@@ -29,6 +30,8 @@
%prep
%setup -q -n gwibber
+%patch0 -p1
+rm -rf gwibber/microblog/support/simplejson
%build
@@ -58,6 +61,10 @@
%changelog
+* Thu Oct 2 2008 Jeremy Katz <katzj at redhat.com> - 0.7-6.102bzr
+- Use the system python-simplejson rather than the one included in the
+ tarball (#464727)
+
* Mon Sep 29 2008 Ian Weller <ianweller at gmail.com> 0.7-5.102bzr
- Requires: mx
- Previous message: [pkgdb] kchmviewer had acl change status
- Next message: rpms/pyroom/devel .cvsignore, 1.2, 1.3 pyroom.spec, 1.1, 1.2 sources, 1.2, 1.3 pyroom, 1.1, NONE pyroom.desktop, 1.1, NONE test, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list