upgpkg: pagure 5.13.3-0.2

Rebuild for Python 3.10

2 files changed, 100 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6decbe73e1bf..57407ee2537d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pagure
 	pkgdesc = A git-centered forge based on python using pygit2
 	pkgver = 5.13.3
-	pkgrel = 0.1
+	pkgrel = 0.2
 	url = https://pagure.io/pagure
 	arch = any
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index e77832279927..6cf502922259 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,132 +8,133 @@
 pkgbase=pagure
 pkgname=("$pkgbase" "$pkgbase-apache" "$pkgbase-mariadb" "$pkgbase-postgresql" "$pkgbase-sqlite")
 pkgver=5.13.3
-pkgrel=0.1
-pkgdesc="A git-centered forge based on python using pygit2"
-arch=("any")
+pkgrel=0.2
+pkgdesc='A git-centered forge based on python using pygit2'
+arch=(any)
 url="https://pagure.io/$pkgbase"
 license=("GPL2")
-_pydeps=('alembic'
-         'arrow'
-         'bcrypt'
-         'binaryornot'
-         'bleach'
-         'blinker'
-         'celery'
-         'chardet'
-         'cryptography'
-         'docutils'
-         'email-validator'
-         'flask'
-         'flask-wtf'
-         'kitchen'
-         'markdown'
-         'munch'
-         'pillow'
-         'psutil'
-         'pygit2'
-         'openid'
-         'openid-cla'
-         'openid-teams'
-         'redis'
-         'requests'
-         'six'
-         'sqlalchemy'
-         'straight.plugin'
-         'wtforms')
-depends=('git'
-         'gitolite' # This is technically optional, but our packaging assumes it
-         'libffi'
-         'libgit2'
-         'libjpeg'
-         'python'
+_pydeps=(alembic
+         arrow
+         bcrypt
+         binaryornot
+         bleach
+         blinker
+         celery
+         chardet
+         cryptography
+         docutils
+         email-validator
+         flask
+         flask-wtf
+         kitchen
+         markdown
+         munch
+         pillow
+         psutil
+         pygit2
+         openid
+         openid-cla
+         openid-teams
+         redis
+         requests
+         six
+         sqlalchemy
+         straight.plugin
+         wtforms)
+depends=(git
+         gitolite # This is technically optional, but our packaging assumes it
+         libffi
+         libgit2
+         libjpeg
+         python
          "${_pydeps[@]/#/python-}"
-         'redis')
+         redis)
 optdepends=('clamav: Scan uploaded attachments')
-makedepends=('python-setuptools')
-source=("https://releases.pagure.org/$pkgbase/$pkgbase-$pkgver.tar.gz")
+makedepends=(python-setuptools)
+_archive="$pkgname-$pkgver"
+source=("https://releases.pagure.org/$pkgbase/$_archive.tar.gz")
 sha256sums=('f684d8193d4c4cf637b465c80cbfece6eb2b1646df3ec4f993adf75ea78d5a1a')
 _homedir="/var/lib/$pkgbase"
 _user=$pkgbase
 
 prepare() {
-    cd "$pkgbase-$pkgver"
-    local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
-    sed -i -e "s#/usr/lib/pythonX.Y/site-packages#$site_packages#" \
-           -e 's/#//' \
-           -e '/!mod_authz/,+4d' \
-           -e '/# Apache 2.4/d' \
-           -e "s#/path/to/git/repositorios#$_homedir#g" \
-           -e "s/=git/=$_user/g" \
-        files/pagure-apache-httpd.conf
-    sed -i -e "/^#DB_URL/d;/^DB_URL/s/^.*$/execdir('pagure_database.cfg')/" \
-        files/pagure.cfg.sample
+	cd "$_archive"
+	local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+	sed -i -e "s#/usr/lib/pythonX.Y/site-packages#$site_packages#" \
+		-e 's/#//' \
+		-e '/!mod_authz/,+4d' \
+		-e '/# Apache 2.4/d' \
+		-e "s#/path/to/git/repositorios#$_homedir#g" \
+		-e "s/=git/=$_user/g" \
+		files/pagure-apache-httpd.conf
+	sed -i -e "/^#DB_URL/d;/^DB_URL/s/^.*$/execdir('pagure_database.cfg')/" \
+		files/pagure.cfg.sample
 }
 
 build() {
-    cd "$pkgbase-$pkgver"
-    python setup.py build
+	cd "$_archive"
+	python setup.py build
 }
 
 check() {
-    cd "$pkgbase-$pkgver"
+	cd "$_archive"
 }
 
 package_pagure() {
-    depends=("$pkgbase-database=$pkgver")
-    optdepends=("$pkgbase-apache: Apache host configuration files")
-    backup=("etc/$pkgbase/alembic.ini"
-             "etc/$pkgbase/pagure.cfg")
-    cd "$pkgbase-$pkgver"
-    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-    install -Dm644 -t "$pkgdir/usr/share/doc/$pkgbase/" {README,UPGRADING}.rst
-    install -Dm644 -T "files/pagure.cfg.sample" "$pkgdir/etc/$pkgbase/pagure.cfg"
-    install -Dm644 -t "$pkgdir/etc/$pkgbase/" "files/alembic.ini"
-    install -Dm644 -t "$pkgdir/usr/share/$pkgbase/pagure_createdb.py" createdb.py
-    install -Dm644 -t "$pkgdir/usr/share/$pkgbase/" files/{api_key_expire_mail,mirror_project_in}.py
-    install -Dm755 -t "$pkgdir/usr/lib/$pkgbase/" files/{aclchecker,keyhelper}.py
-    cp -r alembic "$pkgdir/usr/share/$pkgbase/"
-    # TODO: package stuff in doc folder, needs building
+	depends=("$pkgbase-database=$pkgver")
+	optdepends=("$pkgbase-apache: Apache host configuration files")
+	backup=("etc/$pkgbase/alembic.ini"
+			"etc/$pkgbase/pagure.cfg")
+	cd "$_archive"
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm644 -t "$pkgdir/usr/share/doc/$pkgbase/" {README,UPGRADING}.rst
+	install -Dm644 -T "files/pagure.cfg.sample" "$pkgdir/etc/$pkgbase/pagure.cfg"
+	install -Dm644 -t "$pkgdir/etc/$pkgbase/" "files/alembic.ini"
+	install -Dm644 -t "$pkgdir/usr/share/$pkgbase/pagure_createdb.py" createdb.py
+	install -Dm644 -t "$pkgdir/usr/share/$pkgbase/" files/{api_key_expire_mail,mirror_project_in}.py
+	install -Dm755 -t "$pkgdir/usr/lib/$pkgbase/" files/{aclchecker,keyhelper}.py
+	cp -r alembic "$pkgdir/usr/share/$pkgbase/"
+	# TODO: package stuff in doc folder, needs building
 }
 
 package_pagure-apache() {
-    pkgdesc+=" (Apache host configuration)"
-    depends=("$pkgbase=$pkgver" 'apache' 'mod_wsgi')
-    backup=("etc/httpd/conf/extra/$pkgbase.conf")
-    cd "$pkgbase-$pkgver"
-    install -Dm644 -T "files/pagure-apache-httpd.conf" "$pkgdir/etc/httpd/conf/extra/$pkgbase.conf"
-    install -Dm644 -t "$pkgdir/usr/lib/$pkgbase/" files/{doc_,}pagure.wsgi
+	pkgdesc+=" (Apache host configuration)"
+	depends=("$pkgbase=$pkgver" 'apache' 'mod_wsgi')
+	backup=("etc/httpd/conf/extra/$pkgbase.conf")
+	cd "$_archive"
+	install -Dm644 -T "files/pagure-apache-httpd.conf" "$pkgdir/etc/httpd/conf/extra/$pkgbase.conf"
+	install -Dm644 -t "$pkgdir/usr/lib/$pkgbase/" files/{doc_,}pagure.wsgi
 }
 
 package_pagure-mariadb() {
-    pkgdesc+=" (MariaDB database configuration)"
-    depends=("$pkgbase=$pkgver" 'mariadb' 'python-mysqlclient') # alternative: python-pymysql
-    provides=("$pkgbase-database")
-    conflicts=("$pkgbase-postgresql" "$pkgbase-sqlite")
-    backup=("etc/$pkgbase/pagure_database.cfg")
-    install="$pkgbase-mariadb.install"
-    install -Dm600 <(echo "DB_URL = 'mysql://$_user:<password>@localhost/$pkgbase'") \
-        "$pkgdir/etc/$pkgbase/pagure_database.cfg"
+	pkgdesc+=" (MariaDB database configuration)"
+	depends=("$pkgbase=$pkgver" 'mariadb' 'python-mysqlclient') # alternative: python-pymysql
+	provides=("$pkgbase-database")
+	conflicts=("$pkgbase-postgresql" "$pkgbase-sqlite")
+	backup=("etc/$pkgbase/pagure_database.cfg")
+	install="$pkgbase-mariadb.install"
+	install -Dm600 <(echo "DB_URL = 'mysql://$_user:<password>@localhost/$pkgbase'") \
+		"$pkgdir/etc/$pkgbase/pagure_database.cfg"
 }
 
 package_pagure-postgresql() {
-    pkgdesc+=" (PostgreSQL database configuration)"
-    depends=("$pkgbase=$pkgver" 'postgresql' 'python-psycopg2') # alternative: python-pg8000
-    provides=("$pkgbase-database")
-    conflicts=("$pkgbase-mariadb" "$pkgbase-sqlite")
-    backup=("etc/$pkgbase/pagure_database.cfg")
-    install="$pkgbase-postgresql.install"
-    install -Dm600 <(echo "DB_URL = 'postgres://$_user:<password>@localhost/$pkgbase'") \
-        "$pkgdir/etc/$pkgbase/pagure_database.cfg"
+	pkgdesc+=" (PostgreSQL database configuration)"
+	depends=("$pkgbase=$pkgver" 'postgresql' 'python-psycopg2') # alternative: python-pg8000
+	provides=("$pkgbase-database")
+	conflicts=("$pkgbase-mariadb" "$pkgbase-sqlite")
+	backup=("etc/$pkgbase/pagure_database.cfg")
+	install="$pkgbase-postgresql.install"
+	install -Dm600 <(echo "DB_URL = 'postgres://$_user:<password>@localhost/$pkgbase'") \
+		"$pkgdir/etc/$pkgbase/pagure_database.cfg"
 }
 
 package_pagure-sqlite() {
-    pkgdesc+=" (SQLite database configuration)"
-    depends=("$pkgbase=$pkgver" 'sqlite')
-    provides=("$pkgbase-database")
-    conflicts=("$pkgbase-mariadb" "$pkgbase-postgresql")
-    backup=("etc/$pkgbase/pagure_database.cfg")
-    install="$pkgbase-sqlite.install"
-    install -Dm600 <(echo "DB_URL = 'sqlite:///var/tmp/$pkgbase.sqlite'") \
-        "$pkgdir/etc/$pkgbase/pagure_database.cfg"
+	pkgdesc+=" (SQLite database configuration)"
+	depends=("$pkgbase=$pkgver" 'sqlite')
+	provides=("$pkgbase-database")
+	conflicts=("$pkgbase-mariadb" "$pkgbase-postgresql")
+	backup=("etc/$pkgbase/pagure_database.cfg")
+	install="$pkgbase-sqlite.install"
+	install -Dm600 <(echo "DB_URL = 'sqlite:///var/tmp/$pkgbase.sqlite'") \
+		"$pkgdir/etc/$pkgbase/pagure_database.cfg"
 }