new version 1.5.4-1

2 files changed, 22 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18506dcb415e..e51fc4fa8931 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = trac
 	pkgdesc = Enhanced wiki and issue tracking system for software development projects
-	pkgver = 1.4.3
+	pkgver = 1.5.4
 	pkgrel = 1
 	url = http://trac.edgewall.org/
 	arch = any
 	license = BSD
-	makedepends = python2-babel
-	depends = python2
-	depends = python2-jinja
-	depends = python2-setuptools
-	optdepends = python2-psycopg2: PostgreSQL database support
-	optdepends = python2-pygments: Syntax highlighting
-	optdepends = python2-docutils: reStructuredText support
-	optdepends = python2-babel: localization support
-	optdepends = python2-pytz: complete list of time zones
-	source = https://download.edgewall.org/trac/Trac-1.4.3.tar.gz
-	sha256sums = c93ceed9abee6e3c7789f469862e82a3b9bf3405be73aae3221b5c259e062d21
+	makedepends = python-babel
+	depends = python
+	depends = python-jinja
+	depends = python-setuptools
+	optdepends = python-psycopg2: PostgreSQL database support
+	optdepends = python-pygments: Syntax highlighting
+	optdepends = python-docutils: reStructuredText support
+	optdepends = python-babel: localization support
+	optdepends = python-pytz: complete list of time zones
+	source = https://download.edgewall.org/trac/Trac-1.5.4.tar.gz
+	sha256sums = 59fc453b4f6700f7e79917f1990aa20634d3cf85db2d3888111433725b9796e8
 
 pkgname = trac
diff --git a/PKGBUILD b/PKGBUILD
index 4dfe9095c96e..e7d9b23b78a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,24 @@
 # Contributor: Rubin Simons <rubin@xs4all.nl>
 
 pkgname=trac
-pkgver=1.4.3
+pkgver=1.5.4
 pkgrel=1
 pkgdesc='Enhanced wiki and issue tracking system for software development projects'
 arch=('any')
 url="http://trac.edgewall.org/"
 license=('BSD')
-depends=(python2 python2-jinja python2-setuptools)
-makedepends=(python2-babel)
-optdepends=('python2-psycopg2: PostgreSQL database support'
-            'python2-pygments: Syntax highlighting'
-            'python2-docutils: reStructuredText support'
-            'python2-babel: localization support'
-            'python2-pytz: complete list of time zones')
+depends=(python python-jinja python-setuptools)
+makedepends=(python-babel)
+optdepends=('python-psycopg2: PostgreSQL database support'
+            'python-pygments: Syntax highlighting'
+            'python-docutils: reStructuredText support'
+            'python-babel: localization support'
+            'python-pytz: complete list of time zones')
 source=(https://download.edgewall.org/trac/Trac-$pkgver.tar.gz)
-sha256sums=('c93ceed9abee6e3c7789f469862e82a3b9bf3405be73aae3221b5c259e062d21')
-
-prepare() {
-  cd "$srcdir"/Trac-$pkgver
-  sed -i 's:^#!/usr/bin/env python$:#!/usr/bin/env python2:' \
-    trac/admin/console.py \
-    trac/test.py \
-    trac/web/cgi_frontend.py \
-    trac/web/fcgi_frontend.py \
-    trac/web/standalone.py
-}
+sha256sums=('59fc453b4f6700f7e79917f1990aa20634d3cf85db2d3888111433725b9796e8')
 
 package() {
   cd "$srcdir"/Trac-$pkgver
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  python setup.py install --prefix=/usr --root="$pkgdir"
   install -D -m644 COPYING "$pkgdir"/usr/share/licenses/trac/COPYING
 }