[python-tahrir] Massive facelift in progress.
Ralph Bean
ralph at fedoraproject.org
Wed Jun 26 19:50:42 UTC 2013
commit ded2c42b0b577deb692401e338b5540d2862a995
Author: Ralph Bean <rbean at redhat.com>
Date: Wed Jun 26 15:50:28 2013 -0400
Massive facelift in progress.
.gitignore | 1 +
python-tahrir-actually-fall-back.patch | 24 ++++++++++++++++++++++++
python-tahrir.spec | 13 +++++++++----
sources | 2 +-
4 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 366a0dd..a07fdc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/tahrir-0.1.6.tar.gz
/tahrir-0.1.8.tar.gz
/tahrir-0.1.9.tar.gz
+/tahrir-0.2.0.tar.gz
diff --git a/python-tahrir-actually-fall-back.patch b/python-tahrir-actually-fall-back.patch
new file mode 100644
index 0000000..7e4778e
--- /dev/null
+++ b/python-tahrir-actually-fall-back.patch
@@ -0,0 +1,24 @@
+From 10540279bb3bdc5cb37d89b901f7875c3209c46e Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Wed, 26 Jun 2013 15:46:37 -0400
+Subject: [PATCH] Actually fall back.
+
+---
+ tahrir/utils.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tahrir/utils.py b/tahrir/utils.py
+index 4c799a0..2634c9f 100644
+--- a/tahrir/utils.py
++++ b/tahrir/utils.py
+@@ -94,5 +94,7 @@ def make_avatar_method():
+ size=size,
+ default=gravatar_url,
+ )
++ else:
++ return gravatar_url
+
+ return avatar_method
+--
+1.8.1.4
+
diff --git a/python-tahrir.spec b/python-tahrir.spec
index 6899484..304f998 100644
--- a/python-tahrir.spec
+++ b/python-tahrir.spec
@@ -1,14 +1,15 @@
%global modname tahrir
Name: python-tahrir
-Version: 0.1.9
-Release: 3%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
Summary: A pyramid app for issuing your own Open Badges
Group: Development/Languages
License: AGPLv3+
URL: http://pypi.python.org/pypi/%{modname}
Source0: http://pypi.python.org/packages/source/t/tahrir/%{modname}-%{version}.tar.gz
+Patch0: python-tahrir-actually-fall-back.patch
BuildArch: noarch
@@ -21,8 +22,6 @@ Requires: python-transaction
Requires: python-pyramid-tm
Requires: python-zope-sqlalchemy
Requires: python-weberror
-Requires: python-tw2-sqla
-Requires: python-formencode
Requires: python-velruse
Requires: python-anykeystore
@@ -45,6 +44,9 @@ https://wiki.mozilla.org/Badges
%prep
%setup -q -n %{modname}-%{version}
+# Patch a problem with gravatar
+%patch0 -p1
+
# Make sure that epel/rhel picks up the correct version of sqlalchemy
%{__awk} 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"sqlalchemy>=0.7\"]; import pkg_resources"}1' setup.py > setup.py.tmp
%{__mv} setup.py.tmp setup.py
@@ -89,6 +91,9 @@ sed -i 's/%%(here)s/\/var\/lib\/tahrir/' apache/%{modname}.ini
%attr(-,%{modname},root) %config(noreplace) %{_var}/lib/%{modname}
%changelog
+* Wed Jun 26 2013 Ralph Bean <rbean at redhat.com> - 0.2.0-1
+- Massive facelift.
+
* Thu Jun 13 2013 Ralph Bean <rbean at redhat.com> - 0.1.9-3
- Conditionalize sqlalchemy forward compat package for epel6.
diff --git a/sources b/sources
index 1cb12db..61e68c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21661f2ff3b3a9d889b3836ae6e7adb7 tahrir-0.1.9.tar.gz
+c3996e018d398f8ed2da71abe3458ea6 tahrir-0.2.0.tar.gz
More information about the scm-commits
mailing list