diff --git a/.gitignore b/.gitignore index 9a7d08d..68a7862 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -TracAccountManager-0.2.1dev-r5836.tar.bz2 +/TracAccountManager-0.3dev-r9591.tar.bz2 diff --git a/pull-from-svn.sh b/pull-from-svn.sh index 9c12aba..fe05ded 100755 --- a/pull-from-svn.sh +++ b/pull-from-svn.sh @@ -6,9 +6,9 @@ repo=svn/accountmanagerplugin tarname=TracAccountManager # Specify the branch and revision we're after, plus the version upstream calls itself -branch=0.11 -svnrel=5836 -version=0.2.1 +branch=trunk +svnrel=9591 +version=0.3 # Pull the desired version from svn svn checkout -r ${svnrel} ${site}${repo}/${branch} ${tarname}-${version} diff --git a/replace-MessageWrapper-with-genshi-markup.patch b/replace-MessageWrapper-with-genshi-markup.patch deleted file mode 100644 index 2b0d648..0000000 --- a/replace-MessageWrapper-with-genshi-markup.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: /accountmanagerplugin/trunk/acct_mgr/web_ui.py -=================================================================== ---- /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 4638) -+++ /accountmanagerplugin/trunk/acct_mgr/web_ui.py (revision 5478) -@@ -25,4 +25,5 @@ - from trac.web import chrome - from trac.web.chrome import INavigationContributor, ITemplateProvider -+from genshi.core import Markup - from genshi.builder import tag - -@@ -236,5 +237,5 @@ - del(req.session['force_change_passwd']) - req.session.save() -- chrome.add_notice(req, MessageWrapper(tag( -+ chrome.add_notice(req, Markup(tag( - "Thank you for taking the time to update your password." - ))) -@@ -245,5 +246,5 @@ - data.update({'error': 'Invalid action'}) - if force_change_password: -- chrome.add_warning(req, MessageWrapper(tag( -+ chrome.add_warning(req, Markup(tag( - "You are required to change password because of a recent " - "password change request. ", -@@ -500,14 +501,4 @@ - - --class MessageWrapper(object): -- """Wrapper for add_warning and add_notice to work around the requirement -- for a % operator.""" -- def __init__(self, body): -- self.body = body -- -- def __mod__(self, rhs): -- return self.body -- -- - class EmailVerificationNotification(SingleUserNofification): - template_name = 'verify_email.txt' -@@ -542,5 +533,5 @@ - return handler - if handler is not self and 'email_verification_token' in req.session: -- chrome.add_warning(req, MessageWrapper(tag.span( -+ chrome.add_warning(req, Markup(tag.span( - 'Your permissions have been limited until you ', - tag.a(href=req.href.verify_email())( -@@ -559,5 +550,5 @@ - req.session['email_verification_sent_to'] = req.session.get('email') - self._send_email(req) -- chrome.add_notice(req, MessageWrapper(tag.span( -+ chrome.add_notice(req, Markup(tag.span( - 'An email has been sent to ', req.session['email'], - ' with a token to ', diff --git a/sources b/sources index db4febe..a313010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0518641a63bd3ece9b51ca8f84e7089 TracAccountManager-0.2.1dev-r5836.tar.bz2 +1d71256010be50b94519b1d3145e7e51 TracAccountManager-0.3dev-r9591.tar.bz2 diff --git a/trac-accountmanager-plugin.spec b/trac-accountmanager-plugin.spec index 05e4992..e5ab46a 100644 --- a/trac-accountmanager-plugin.spec +++ b/trac-accountmanager-plugin.spec @@ -1,10 +1,10 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define svnrev 5836 +%global svnrev 9591 Name: trac-accountmanager-plugin -Version: 0.2.1 -Release: 0.3.20090522svn%{svnrev}%{?dist} +Version: 0.3 +Release: 0.1.20101206svn%{svnrev}%{?dist} Summary: Trac plugin for account registration and management Group: Applications/Internet @@ -12,15 +12,14 @@ License: Copyright only URL: http://trac-hacks.org/wiki/AccountManagerPlugin Source0: TracAccountManager-%{version}dev-r%{svnrev}.tar.bz2 Source1: pull-from-svn.sh -# http://trac-hacks.org/changeset/5478?format=diff -Patch0: replace-MessageWrapper-with-genshi-markup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: trac >= 0.11 +Requires: trac >= 0.12 +Requires: python-genshi >= 0.5 Requires: python-setuptools %description @@ -34,9 +33,6 @@ The AccountManagerPlugin offers several features for managing user accounts: %prep %setup -n TracAccountManager-%{version}dev-r%{svnrev} -q -# Upstream trunk patch for http://trac-hacks.org/ticket/4125 -# (broken email verification in trac 0.11.4) -%patch0 -p3 %build @@ -47,6 +43,8 @@ The AccountManagerPlugin offers several features for managing user accounts: rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +# Don't need to package this +rm %{buildroot}%{python_sitelib}/acct_mgr/locale/.placeholder %clean rm -rf %{buildroot} @@ -55,10 +53,22 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README contrib/sessionstore_convert.py -%{python_sitelib}/* +%{python_sitelib}/acct_mgr/ +%{python_sitelib}/TracAccountManager-%{version}dev_r%{svnrev}-py*.egg-info/ %changelog +* Tue Dec 14 2010 Paul Howarth - 0.3-0.1.20101206svn9591 +- Update to current svn snapshot (from trunk for trac 0.12) +- Require trac >= 0.12 +- Require python-genshi >= 0.5 as per setup.py + +* Fri Dec 10 2010 Ben Boeckel - 0.2.1-0.5.20090522svn5836 +- Rebuild for new trac + +* Thu Jul 22 2010 David Malcolm - 0.2.1-0.4.20090522svn5836 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Fri Aug 28 2009 Ben Boeckel - 0.2.1-0.3.20090522svn5836 - Remove comments - Fix tarball