[trac-accountmanager-plugin] Update to current svn snapshot (from trunk for trac 0.12)

Paul Howarth pghmcfc at fedoraproject.org
Wed Jan 11 16:28:34 UTC 2012 

commit cb8f7ab3ac2c769129ebcdee87332f47170a5319
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Jan 11 16:27:26 2012 +0000

    Update to current svn snapshot (from trunk for trac 0.12)
    
    - Update to current svn snapshot (from trunk for trac 0.12)
    - Set timestamp on tarball to timestamp of latest change in svn
    - Add new translations to %files list
    - Drop test suite patch, no longer needed
    - Package changelog and README.update
    - NOTE: existing users should read README.update for important change details

 .gitignore                                  |    2 +-
 TracAccountManager-0.3dev-r9591-tests.patch |   26 -------------
 pull-from-svn.sh                            |    8 +++-
 sources                                     |    2 +-
 trac-accountmanager-plugin.spec             |   55 ++++++++++++++++----------
 5 files changed, 42 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68a7862..1c9475e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/TracAccountManager-0.3dev-r9591.tar.bz2
+/TracAccountManager-[0-9a-z.]*.tar.bz2
diff --git a/pull-from-svn.sh b/pull-from-svn.sh
index fe05ded..f9c66c2 100755
--- a/pull-from-svn.sh
+++ b/pull-from-svn.sh
@@ -7,8 +7,8 @@ tarname=TracAccountManager
 
 # Specify the branch and revision we're after, plus the version upstream calls itself
 branch=trunk
-svnrel=9591
-version=0.3
+svnrel=11131
+version=0.4
 
 # Pull the desired version from svn
 svn checkout -r ${svnrel} ${site}${repo}/${branch} ${tarname}-${version}
@@ -27,6 +27,10 @@ python setup.py sdist --formats bztar
 cd -
 mv ${tarname}-${version}/dist/${tarname}-${version}dev-r${svnrel}.tar.bz2 .
 
+# Fix the timestamp of the tarball
+timestamp=$(svn info ${tarname}-${version} | awk '/^Last Changed Date:/ { print $4 " " $5 " " $6 }')
+touch --date="${timestamp}" ${tarname}-${version}dev-r${svnrel}.tar.bz2
+
 # Display checkout status
 svn info ${tarname}-${version} | grep "Last Changed"
 
diff --git a/sources b/sources
index a313010..aac95de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d71256010be50b94519b1d3145e7e51  TracAccountManager-0.3dev-r9591.tar.bz2
+332d792180c28628a4a768c4b16bab6d  TracAccountManager-0.4dev-r11131.tar.bz2
diff --git a/trac-accountmanager-plugin.spec b/trac-accountmanager-plugin.spec
index ff32a3a..b97e369 100644
--- a/trac-accountmanager-plugin.spec
+++ b/trac-accountmanager-plugin.spec
@@ -1,21 +1,20 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?pybasever: %global pybasever %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0.0)}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" 2>/dev/null)}
+%{!?pybasever: %global pybasever %(%{__python} -c "import sys ; print sys.version[:3]" 2>/dev/null || echo 0.0)}
 
-%global svnrev  9591
-%global svndate 20101206
+%global svnrev  11131
+%global svndate 20120108
 
 Name:           trac-accountmanager-plugin
-Version:        0.3
-Release:        0.3.%{svndate}svn%{svnrev}%{?dist}
+Version:        0.4
+Release:        0.1.%{svndate}svn%{svnrev}%{?dist}
 Summary:        Trac plugin for account registration and management
 Group:          Applications/Internet
 License:        Copyright only
 URL:            http://trac-hacks.org/wiki/AccountManagerPlugin
 Source0:        TracAccountManager-%{version}dev-r%{svnrev}.tar.bz2
 Source1:        pull-from-svn.sh
-Patch0:         TracAccountManager-0.3dev-r9591-tests.patch
 Patch1:         TracAccountManager-0.3dev-r9591-genshi06.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -38,27 +37,22 @@ Requires:       python-genshi >= 0.6
 
 %description
 The AccountManagerPlugin offers several features for managing user accounts:
+
  * allow users to register new accounts
  * login via an HTML form instead of using HTTP authentication
  * allow existing users to change their passwords or delete their accounts
  * send a new password to users who've forgotten their password
  * administer user accounts using the trac web interface
 
-
 %prep
 %setup -n TracAccountManager-%{version}dev-r%{svnrev} -q
 
-# Fix broken test suite
-%patch0 -p1
-
-# Make sure we can find Genshi >= 0.6 on EL-6, where it's in an egg
+# Make sure we can find Genshi ≥ 0.6 on EL-6, where it's in an egg
 %patch1 -p1
 
-
 %build
 %{__python} setup.py build
 
-
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
@@ -66,40 +60,59 @@ rm -rf %{buildroot}
 # Don't need to package this
 rm %{buildroot}%{python_sitelib}/acct_mgr/locale/.placeholder
 
-
 %check
 %{__python} setup.py test
 
-
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
-%doc README contrib/sessionstore_convert.py
+%doc changelog README README.update contrib/sessionstore_convert.py
 %dir %{python_sitelib}/acct_mgr/
 %{python_sitelib}/acct_mgr/*.py*
 %{python_sitelib}/acct_mgr/htdocs/
 %{python_sitelib}/acct_mgr/templates/
 %dir %{python_sitelib}/acct_mgr/locale/
+%dir %{python_sitelib}/acct_mgr/locale/cs/
+%dir %{python_sitelib}/acct_mgr/locale/cs/LC_MESSAGES/
+%lang(cs) %{python_sitelib}/acct_mgr/locale/cs/LC_MESSAGES/acct_mgr.mo
 %dir %{python_sitelib}/acct_mgr/locale/de/
 %dir %{python_sitelib}/acct_mgr/locale/de/LC_MESSAGES/
 %lang(de) %{python_sitelib}/acct_mgr/locale/de/LC_MESSAGES/acct_mgr.mo
 %dir %{python_sitelib}/acct_mgr/locale/es/
 %dir %{python_sitelib}/acct_mgr/locale/es/LC_MESSAGES/
 %lang(es) %{python_sitelib}/acct_mgr/locale/es/LC_MESSAGES/acct_mgr.mo
+%dir %{python_sitelib}/acct_mgr/locale/fr/
+%dir %{python_sitelib}/acct_mgr/locale/fr/LC_MESSAGES/
+%lang(fr) %{python_sitelib}/acct_mgr/locale/fr/LC_MESSAGES/acct_mgr.mo
+%dir %{python_sitelib}/acct_mgr/locale/it/
+%dir %{python_sitelib}/acct_mgr/locale/it/LC_MESSAGES/
+%lang(it) %{python_sitelib}/acct_mgr/locale/it/LC_MESSAGES/acct_mgr.mo
 %dir %{python_sitelib}/acct_mgr/locale/ja/
 %dir %{python_sitelib}/acct_mgr/locale/ja/LC_MESSAGES/
 %lang(ja) %{python_sitelib}/acct_mgr/locale/ja/LC_MESSAGES/acct_mgr.mo
+%dir %{python_sitelib}/acct_mgr/locale/nl/
+%dir %{python_sitelib}/acct_mgr/locale/nl/LC_MESSAGES/
+%lang(nl) %{python_sitelib}/acct_mgr/locale/nl/LC_MESSAGES/acct_mgr.mo
 %dir %{python_sitelib}/acct_mgr/locale/ru/
 %dir %{python_sitelib}/acct_mgr/locale/ru/LC_MESSAGES/
 %lang(ru) %{python_sitelib}/acct_mgr/locale/ru/LC_MESSAGES/acct_mgr.mo
+%dir %{python_sitelib}/acct_mgr/locale/sv/
+%dir %{python_sitelib}/acct_mgr/locale/sv/LC_MESSAGES/
+%lang(sv) %{python_sitelib}/acct_mgr/locale/sv/LC_MESSAGES/acct_mgr.mo
 %{python_sitelib}/TracAccountManager-%{version}dev_r%{svnrev}-py%{pybasever}.egg-info/
 
-
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.3.20101206svn9591
+* Wed Jan 11 2012 Paul Howarth <paul at city-fan.org> - 0.4-0.1.20120108svn11131
+- Update to current svn snapshot (from trunk for trac 0.12)
+- Set timestamp on tarball to timestamp of latest change in svn
+- Add new translations to %%files list
+- Drop test suite patch, no longer needed
+- Package changelog and README.update
+- NOTE: existing users should read README.update for important change details
+
+* Wed Feb  9 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.3.20101206svn9591
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Fri Dec 24 2010 Paul Howarth <paul at city-fan.org> - 0.3-0.2.20101206svn9591

More information about the scm-commits mailing list