From 203be310b0810da95a73ee7d333f0da7c9a07acf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 14 Nov 2012 16:11:14 -0500 Subject: update libre/parabolaweb-utils: make GITURL and GITREF configurable --- libre/parabolaweb-utils/PKGBUILD | 12 +++++++----- libre/parabolaweb-utils/parabolaweb-download | 14 +++++++------- libre/parabolaweb-utils/parabolaweb.conf | 2 ++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index e0b70ba1a..5000e0201 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -8,7 +8,7 @@ pkgname=parabolaweb-utils pkgver=`_get_pkgver` -pkgrel=5 +pkgrel=6 pkgdesc="Utils for the Parabola website" arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" @@ -17,13 +17,15 @@ depends=( 'python2' # duh 'python2-flup' # for fcgi 'postgresql' # for database - 'git' # used in parabolaweb-update - 'libretools' # used in parabolaweb-update + 'git' # used in parabolaweb-download + 'libretools' # used in parabolaweb-{download,update} `_get_depends`) backup=('etc/conf.d/parabolaweb') export pkgver +makedepends=(makepkg-git) + source=(git://parabolagnulinux.org/parabolaweb.git parabolaweb-download parabolaweb-update @@ -47,9 +49,9 @@ package() { } md5sums=('SKIP' - '01bed679a4fd768e720bfd0f3c7d6694' + 'f162c2ce49b4cafe0a14bd4767dfea04' 'a73063b14746720b77fdbab851f5c161' 'd5294495f42df29d29519ebd0a8f6093' 'cc15e153f99fba82e7bb032896f655c2' 'a468016a7155b5da46521dcfc6428384' - '9b565ef07e44d395bf7a0e484e3d19d1') + 'ffd37a19b1a72fbac2c58504aa17b355') diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download index 823a18811..e124295d4 100644 --- a/libre/parabolaweb-utils/parabolaweb-download +++ b/libre/parabolaweb-utils/parabolaweb-download @@ -4,8 +4,8 @@ . /usr/bin/libremessages dir=$WEBDIR -repo=git://parabolagnulinux.org/parabolaweb.git -ref=master +repo=$GITURL +ref=$GITREF cd_safe() { if ! cd "$1"; then @@ -26,11 +26,11 @@ download_git() { else cd_safe "$dir" # Make sure we are fetching the right repo - # if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then - # error "$(gettext "%s is not a clone of %s")" "$dir" "$repo" - # plain "$(gettext "Aborting...")" - # exit 1 - # fi + if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then + error "$(gettext "%s is not a clone of %s")" "$dir" "$repo" + plain "$(gettext "Aborting...")" + exit 1 + fi msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git pull origin "$ref"; then # only warn on failure to allow offline builds diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf index 467e62e2c..5363479b3 100644 --- a/libre/parabolaweb-utils/parabolaweb.conf +++ b/libre/parabolaweb-utils/parabolaweb.conf @@ -2,3 +2,5 @@ HOST=127.0.0.1 PORT=8090 # 80 is nginx WEBDIR=/srv/http/web WEBUSER=nobody +GITURL=git://parabolagnulinux.org/parabolaweb.git +GITREF=master -- cgit v1.2.3 From b0575d04cb0bd23a5d0185daccfe5916ce919cac Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 14 Nov 2012 16:48:22 -0500 Subject: update libre/parabolaweb-utils: run update_types_permissions if it exists --- libre/parabolaweb-utils/PKGBUILD | 6 +++--- libre/parabolaweb-utils/parabolaweb-update | 17 +++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index 5000e0201..bfdfc54da 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -8,7 +8,7 @@ pkgname=parabolaweb-utils pkgver=`_get_pkgver` -pkgrel=6 +pkgrel=7 pkgdesc="Utils for the Parabola website" arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" @@ -18,7 +18,7 @@ depends=( 'python2-flup' # for fcgi 'postgresql' # for database 'git' # used in parabolaweb-download - 'libretools' # used in parabolaweb-{download,update} + 'libretools' # used in parabolaweb-{download,update} (libremessages) `_get_depends`) backup=('etc/conf.d/parabolaweb') @@ -50,7 +50,7 @@ package() { md5sums=('SKIP' 'f162c2ce49b4cafe0a14bd4767dfea04' - 'a73063b14746720b77fdbab851f5c161' + '184f3e52781747369d8e26abc9723f7c' 'd5294495f42df29d29519ebd0a8f6093' 'cc15e153f99fba82e7bb032896f655c2' 'a468016a7155b5da46521dcfc6428384' diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update index 45e17c4f2..178917673 100644 --- a/libre/parabolaweb-utils/parabolaweb-update +++ b/libre/parabolaweb-utils/parabolaweb-update @@ -15,17 +15,18 @@ find_makefiles() { } clean() { - msg "Purging old .pyc files...." cd "$WEBDIR" + msg "Purging old .pyc files..." find . -name '*.pyc' -delete + msg "Purging GNU Make generated files..." for dir in `find_makefiles`; do make -C "$WEBDIR/$dir" clean done } configure() { - msg "Checking configuration...." cd "$WEBDIR" + msg "Checking configuration..." if [[ ! -f local_settings.py ]]; then msg2 "Configuration file missing, opening editor..." cp local_settings.py.example local_settings.tmp.$$.py @@ -36,7 +37,7 @@ configure() { msg "Failed to configure, exiting" exit 1 fi - msg2 "Creating database...." + msg2 "Creating database..." ./manage.py syncdb else msg2 "Current configuration checks out" @@ -44,11 +45,15 @@ configure() { } update-database() { - msg "Updating database...." cd "$WEBDIR" - msg2 "Running migrations...." + msg "Updating database..." + msg2 "Running migrations..." ./manage.py migrate - msg2 "Loading fixtures...." + if [[ -f devel/management/commands/update_types_permissions.py ]]; then + msg2 "Updating permission..." + ./manage.py update_types_permissions + fi + msg2 "Loading fixtures..." ./manage.py loaddata */fixtures/*.json } -- cgit v1.2.3 From b1c72d09dd64bffc2fa820bf0927623efc8a394f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 15 Nov 2012 01:42:27 -0500 Subject: improve libre/parabolaweb-utils --- libre/parabolaweb-utils/PKGBUILD | 4 ++-- libre/parabolaweb-utils/parabolaweb-update | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index bfdfc54da..5fdd12bdb 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -8,7 +8,7 @@ pkgname=parabolaweb-utils pkgver=`_get_pkgver` -pkgrel=7 +pkgrel=8 pkgdesc="Utils for the Parabola website" arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" @@ -50,7 +50,7 @@ package() { md5sums=('SKIP' 'f162c2ce49b4cafe0a14bd4767dfea04' - '184f3e52781747369d8e26abc9723f7c' + '7c212024c134fdd0d0318b52a5448ddb' 'd5294495f42df29d29519ebd0a8f6093' 'cc15e153f99fba82e7bb032896f655c2' 'a468016a7155b5da46521dcfc6428384' diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update index 178917673..2da9eea8a 100644 --- a/libre/parabolaweb-utils/parabolaweb-update +++ b/libre/parabolaweb-utils/parabolaweb-update @@ -18,7 +18,7 @@ clean() { cd "$WEBDIR" msg "Purging old .pyc files..." find . -name '*.pyc' -delete - msg "Purging GNU Make generated files..." + msg "Purging old GNU Make generated files..." for dir in `find_makefiles`; do make -C "$WEBDIR/$dir" clean done @@ -50,7 +50,7 @@ update-database() { msg2 "Running migrations..." ./manage.py migrate if [[ -f devel/management/commands/update_types_permissions.py ]]; then - msg2 "Updating permission..." + msg2 "Updating permissions..." ./manage.py update_types_permissions fi msg2 "Loading fixtures..." @@ -74,10 +74,11 @@ main() { exit 1 fi + if [[ -d "$WEBDIR" ]]; then + clean + fi parabolaweb-download - clean configure - clean update-database update-filesystem } -- cgit v1.2.3 From 0cd9adb532064d3784120e8ef2df1631d83b96fb Mon Sep 17 00:00:00 2001 From: aurelien Date: Thu, 15 Nov 2012 10:12:55 +0100 Subject: + python2-cheetah (i686) python-prettytable (any) python2-argparse (any) --- pcr/python-prettytable/PKGBUILD | 29 +++++++++++++++++++++++++++++ pcr/python2-argparse/PKGBUILD | 25 +++++++++++++++++++++++++ pcr/python2-cheetah/Changelog | 12 ++++++++++++ pcr/python2-cheetah/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 pcr/python-prettytable/PKGBUILD create mode 100644 pcr/python2-argparse/PKGBUILD create mode 100644 pcr/python2-cheetah/Changelog create mode 100644 pcr/python2-cheetah/PKGBUILD diff --git a/pcr/python-prettytable/PKGBUILD b/pcr/python-prettytable/PKGBUILD new file mode 100644 index 000000000..92d42f18e --- /dev/null +++ b/pcr/python-prettytable/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Emmanuel Gil Peyrot +# Contributor: Xiao Er +# Contributor: Victor Noel + +# Hack for AUR +pkgname='python2-prettytable' +true && pkgname=('python-prettytable' 'python2-prettytable') + +pkgver=0.6.1 +pkgrel=2 +pkgdesc="A simple Python library for easily displaying tabular data in a visually appealing ASCII table format" +url="http://pypi.python.org/pypi/PrettyTable" +arch=('any') +license=('BSD') +makedepends=('python-distribute' 'python2-distribute') +source=(http://pypi.python.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz) +md5sums=('8f97da999f52e47e28ec4ffe7f25c4d8') + +package_python-prettytable() { + depends=('python') + cd $srcdir/prettytable-$pkgver + python setup.py install --root="$pkgdir/" +} + +package_python2-prettytable() { + depends=('python2') + cd $srcdir/prettytable-$pkgver + python2 setup.py install --root="$pkgdir/" +} diff --git a/pcr/python2-argparse/PKGBUILD b/pcr/python2-argparse/PKGBUILD new file mode 100644 index 000000000..cda95c0e2 --- /dev/null +++ b/pcr/python2-argparse/PKGBUILD @@ -0,0 +1,25 @@ +# Contributor: Lukas Linhart +# Contributor: Changaco +# Contributor: Nicolas Pouillard +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres + +pkgname=python2-argparse +pkgver=1.2.1 +pkgrel=1 +pkgdesc="Command line parsing library for python" +arch=('any') +url='http://code.google.com/p/argparse/' +conflicts=('argparse') +license=('Apache') +depends=('python2') +makedepends=('setuptools') +source=("http://argparse.googlecode.com/files/argparse-$pkgver.tar.gz") + +# While python 2.7 has a builtin argparse module, +# packages built with setuptools still needs this one. + +build() { + cd ${srcdir}/argparse-$pkgver + python2 setup.py build || return 1 + python2 setup.py install --root=${pkgdir} || return 1 +} diff --git a/pcr/python2-cheetah/Changelog b/pcr/python2-cheetah/Changelog new file mode 100644 index 000000000..e95e8c91f --- /dev/null +++ b/pcr/python2-cheetah/Changelog @@ -0,0 +1,12 @@ +2012-03-25 Julien Nicoulaud + + * 2.4.4-5 : + Change dependency on 'python-markdown' to 'python2-markdown' since + FS#28265 is solved. + +2012-01-31 Julien Nicoulaud + + * 2.4.4-4 : + Add changelog. + Remove unneeded shebang modification. + diff --git a/pcr/python2-cheetah/PKGBUILD b/pcr/python2-cheetah/PKGBUILD new file mode 100644 index 000000000..ea6b1036b --- /dev/null +++ b/pcr/python2-cheetah/PKGBUILD @@ -0,0 +1,34 @@ +# Contributor: Julien Nicoulaud +# Contributor: James Rayner +# Contributor: Todd Maynard +# Source: https://github.com/nicoulaj/archlinux-packages +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres + +pkgname=python2-cheetah +pkgver=2.4.4 +pkgrel=5 +pkgdesc="A Python-powered template engine and code generator" +arch=(i686 x86_64) +url="http://www.cheetahtemplate.org" +license=(custom) +depends=(python2 python2-markdown) +makedepends=(python2-distribute) +optdepends=('python2-pygments: for the CodeHighlighter filter') +provides=(cheetah python-cheetah) +conflicts=(cheetah python-cheetah) +changelog=Changelog +source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz) + +build() { + cd "${srcdir}/Cheetah-${pkgver}" + python2 setup.py build +} + +package() { + msg "Install..." + cd "${srcdir}/Cheetah-${pkgver}" + python2 setup.py install --root="${pkgdir}" || return 1 + + msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..." + install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} -- cgit v1.2.3 From 87818f9f0bbcf93bda64edd9fb490944435ad23b Mon Sep 17 00:00:00 2001 From: aurelien Date: Thu, 15 Nov 2012 10:21:37 +0100 Subject: +re2-hg x86_64 --- pcr/re2-hg/PKGBUILD | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pcr/re2-hg/PKGBUILD diff --git a/pcr/re2-hg/PKGBUILD b/pcr/re2-hg/PKGBUILD new file mode 100644 index 000000000..915af840b --- /dev/null +++ b/pcr/re2-hg/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres + +pkgname=re2-hg +pkgver=1 +pkgrel=1 +pkgdesc='Fast, safe and thread-friendly alternative to backtracking regular expression engines' +arch=('i686' 'x86_64') +url='http://code.google.com/p/re2/' +license=('GPL2') +provides=('re2') +makedepends=('mercurial') + +build() { + rm -rf re2 + hg clone https://re2.googlecode.com/hg re2 + + cd re2 + + sed -i 's_prefix=/usr/local_prefix=/usr_' Makefile + + make +} + +package() { + cd re2 + + make DESTDIR=${pkgdir} install +} -- cgit v1.2.3 From ecc0a835e2453a8d44a08883bcd3b3f753ffce47 Mon Sep 17 00:00:00 2001 From: aurelien Date: Thu, 15 Nov 2012 12:06:28 +0100 Subject: +libtxc_dxtn --- pcr/libtxc_dxtn/PKGBUILD | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pcr/libtxc_dxtn/PKGBUILD diff --git a/pcr/libtxc_dxtn/PKGBUILD b/pcr/libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..d491ed6fb --- /dev/null +++ b/pcr/libtxc_dxtn/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Jan "heftig" Steffens +# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres + +pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=2 +arch=(i686 x86_64) +pkgdesc="Texture compression library for Mesa" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(mesa) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v1.2.3 From 9e33443ecf9575280008587e78750259e0519335 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 15 Nov 2012 11:47:04 -0500 Subject: add libre/python-pgpdump It's soon to be a dependency of parabolaweb --- libre/python-pgpdump/PKGBUILD | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 libre/python-pgpdump/PKGBUILD diff --git a/libre/python-pgpdump/PKGBUILD b/libre/python-pgpdump/PKGBUILD new file mode 100644 index 000000000..e65f60dfa --- /dev/null +++ b/libre/python-pgpdump/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker + +_pkgname=pgpdump +pkgname=(python-pgpdump python2-pgpdump) +pkgver=1.4 +pkgdesc=" a Python library for parsing PGP packets" +url="https://github.com/toofishes/python-pgpdump" +license=('custom:BSD3') + +pkgrel=1 +arch=(any) +makedepends=(python python2) +provides=(python2-pgpdump) +source=(http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz) +md5sums=(b437c28ff9d6a6257a0062c0bbe2a9ec) + +package_python-pgpdump() { + cd "$srcdir/$_pkgname-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_python2-pgpdump() { + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} -- cgit v1.2.3