From 52442b30a60f3a0dc7bc0eb214d123d001987c83 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2011 15:14:25 +0000 Subject: Wed Sep 7 15:14:25 UTC 2011 --- community/conkeror-git/PKGBUILD | 8 +++--- community/conkeror-git/conkeror.sh | 4 +-- community/gcolor2/PKGBUILD | 30 +++++++++++++------- community/gnome-packagekit/PKGBUILD | 4 +-- community/kaudiocreator/PKGBUILD | 6 ++-- community/packagekit/PKGBUILD | 9 ++++-- community/perl-list-moreutils/PKGBUILD | 52 ++++++++++++++++++++++------------ community/pkgtools/PKGBUILD | 13 +++++---- community/pkgtools/pkgtools.install | 4 +++ 9 files changed, 81 insertions(+), 49 deletions(-) (limited to 'community') diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD index 473dc9608..5529afb8d 100644 --- a/community/conkeror-git/PKGBUILD +++ b/community/conkeror-git/PKGBUILD @@ -1,10 +1,10 @@ # Contributor: Heeru Kiyura # Maintainer: Stefan Husmann -_commit=8b8d97035432f02e16f26334a47ca340b47d81fd +_commit=0b48f8c21f90f26e78f06c15e144d85683981b85 pkgname=conkeror-git -pkgver=0.9.3 -pkgrel=9 +pkgver=1.0pre +pkgrel=1 pkgdesc="A highly programmable web browser based on Mozilla XULRunner." arch=('i686' 'x86_64') url="http://conkeror.mozdev.org/" @@ -14,7 +14,7 @@ makedepends=('git' 'imagemagick') provides=(conkeror) source=(conkeror_gimpfile.xpm conkeror.sh) md5sums=('b592582a5b923db1707615564a95737f' - 'c8c2a1e54312fc504cbf868d55446e35') + '11c6c76a2639254754b34a542f1965a1') install=conkeror-git.install __gitroot="git://repo.or.cz/conkeror.git" diff --git a/community/conkeror-git/conkeror.sh b/community/conkeror-git/conkeror.sh index 7de1e7c02..963720513 100644 --- a/community/conkeror-git/conkeror.sh +++ b/community/conkeror-git/conkeror.sh @@ -1,4 +1,2 @@ #!/bin/sh -cd /usr/share/conkeror/ -xulrunner application.ini $1 -cd - +exec xulrunner /usr/share/conkeror/application.ini "$@" diff --git a/community/gcolor2/PKGBUILD b/community/gcolor2/PKGBUILD index 68f1304e1..b9b30a4df 100644 --- a/community/gcolor2/PKGBUILD +++ b/community/gcolor2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 9537 2010-01-27 00:58:00Z dgriffiths $ -# Maintainer: pressh +# Contributor: pressh # Contributor: Eric Belanger # Contributor: shaun lastra +# Maintainer: Daniel J Griffiths pkgname=gcolor2 pkgver=0.4 -pkgrel=5 +pkgrel=6 pkgdesc="A simple GTK+2 color selector" arch=('i686' 'x86_64') url="http://gcolor2.sf.net/" @@ -19,13 +19,21 @@ md5sums=('02de9d925ad5921522685f402caec3ec' '9523da11b40dd167964d1b50b40250d5') build() { - cd $srcdir/$pkgname-$pkgver - [ "$CARCH" == "x86_64" ] && (patch -p1 < ../gcolor2-0.4-amd64.patch || return 1) - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + [ "$CARCH" == "x86_64" ] && (patch -p1 < ../gcolor2-0.4-amd64.patch) -# install desktop file -install -Dm644 $srcdir/gcolor2.desktop \ - $pkgdir/usr/share/applications/gcolor2.desktop + # fix fs#25904 + sed -i 's/\[:space:\]/[&]/g' configure + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # install desktop file + install -Dm644 ${srcdir}/gcolor2.desktop \ + ${pkgdir}/usr/share/applications/gcolor2.desktop } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 390f39a73..684c604b7 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 48532 2011-06-01 14:10:40Z jconder $ +# $Id: PKGBUILD 55211 2011-09-06 11:02:14Z jconder $ # Maintainer: Jonathan Conder pkgname=gnome-packagekit pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD index 7f19b59f5..cd6f3fd99 100644 --- a/community/kaudiocreator/PKGBUILD +++ b/community/kaudiocreator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51505 2011-07-10 22:05:47Z lcarlier $ +# $Id: PKGBUILD 55199 2011-09-06 06:39:38Z lcarlier $ # Maintainer: Andrea Scarpino # Contributor: Nick B pkgname=kaudiocreator -pkgver=1.2.95 +pkgver=1.3 pkgrel=1 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdemultimedia-kioslave' 'taglib' 'libdiscid') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://www.kde-apps.org/CONTENT/content-files/107645-${pkgname}-${pkgver}.tar.bz2") -md5sums=('5449607bb940b7b9522f5c47c6149f99') +md5sums=('6adce848d3cdc9d80a52d35144890c86') build() { cd ${srcdir} diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index b12c49445..847c39601 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 53398 2011-08-03 10:39:01Z jconder $ +# $Id: PKGBUILD 55209 2011-09-06 10:19:56Z jconder $ # Maintainer: Jonathan Conder pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.17 +pkgver=0.6.18 pkgrel=1 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') @@ -13,11 +13,14 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz") -sha256sums=('7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3') +sha256sums=('38e22db73360b50e4b495d03a8d7e44e1fd1525ac44fb4a3bbac99ad21779c32') build() { cd "$srcdir/PackageKit-$pkgver" + # TODO: remove when this is fixed upstream + find -name '*.moc' -print0 | xargs -0 rm + sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in' sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in' sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py diff --git a/community/perl-list-moreutils/PKGBUILD b/community/perl-list-moreutils/PKGBUILD index f61467d58..454cfa2ee 100644 --- a/community/perl-list-moreutils/PKGBUILD +++ b/community/perl-list-moreutils/PKGBUILD @@ -1,32 +1,48 @@ -# Maintainer: François Charette +# Maintainer : Justin "juster" Davis +# Generator : pbjam 0.01 pkgname=perl-list-moreutils -_cpanname=List-MoreUtils -pkgver=0.32 +pkgver=0.33 pkgrel=1 pkgdesc="Provide the stuff missing in List::Util" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/$_cpanname" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz") -md5sums=('5af56334f8261f4662bd5e2b3f5e4e62') +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.5.30') +url=http://search.cpan.org/dist/List-MoreUtils +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") +md5sums=(8a33c84028cc2ff3e92c92434b326c0f) +sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) +_distdir="${srcdir}/List-MoreUtils-${pkgver}" build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) } check() { - cd "$srcdir/${_cpanname}-$pkgver" - make test + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) } package() { - cd "$srcdir/${_cpanname}-$pkgver" - make install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -o -name '*.pod' -delete + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD index 9328188ea..fc69319c4 100644 --- a/community/pkgtools/PKGBUILD +++ b/community/pkgtools/PKGBUILD @@ -1,19 +1,22 @@ # Maintainer: Daenyth # Contributor: Daenyth pkgname=pkgtools -pkgver=22 +pkgver=23 pkgrel=1 pkgdesc="A collection of scripts for Arch Linux packages" arch=('i686' 'x86_64') url="http://bbs.archlinux.org/viewtopic.php?pid=384196" license=('GPL') -source=(http://github.com/Daenyth/pkgtools/tarball/v$pkgver) +source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver) backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf') install=pkgtools.install provides=(newpkg pkgfile) -depends=('bash>=4' 'python2' 'pcre' 'libarchive') -optdepends=('cron: For pkgfile --update entry') -md5sums=('37430c4fa13b4cf4afb233100706f5ae') +depends=('bash>=4' 'pcre' 'libarchive' 'python') +optdepends=('cron: For pkgfile --update entry' + 'abs: Provides proto packaging files for newpkg' + 'python-yaml: for gem2arch' + 'python2: for pkgconflict') +md5sums=('5361111e31741f8d7ff8ca45c7996b6b') build() { cd "$srcdir/Daenyth-$pkgname"-* diff --git a/community/pkgtools/pkgtools.install b/community/pkgtools/pkgtools.install index 2fee961fa..bcbf2f85c 100644 --- a/community/pkgtools/pkgtools.install +++ b/community/pkgtools/pkgtools.install @@ -50,6 +50,10 @@ post_upgrade() { echo " - This version of pkgtools contains a new tool called 'maintpkg'" echo " It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors" fi + if is_update_from $2 22-1; then + echo " - This is the largest release in a long time. This updates all python scripts to py3k." + echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging" + fi } ## arg 1: the old package version -- cgit v1.2.3-54-g00ecf