From 68572eac2031955131806e1ab066f5aaac1396e2 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Apr 2012 00:01:59 +0000 Subject: Fri Apr 20 00:01:59 UTC 2012 --- extra/avahi/PKGBUILD | 5 ++--- extra/efibootmgr/PKGBUILD | 6 +++--- extra/efibootmgr/efibootmgr_default_to_grub2.patch | 11 +++++----- extra/gnome-keyring-sharp/PKGBUILD | 7 +++--- extra/python/PKGBUILD | 25 +++++++++------------- extra/subversion/PKGBUILD | 22 +++++++++++-------- 6 files changed, 37 insertions(+), 39 deletions(-) (limited to 'extra') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 34a6c086f..424bf2c46 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155887 2012-04-08 22:28:42Z bisson $ +# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $ # Contributor: Douglas Soares de Andrade # Maintainer: Gaetan Bisson pkgname=avahi pkgver=0.6.31 -pkgrel=2 +pkgrel=3 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -35,7 +35,6 @@ sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') install=install diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index d1a44c69e..0fd7bb248 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149530 2012-02-08 11:51:04Z tpowa $ +# $Id: PKGBUILD 156423 2012-04-18 07:53:47Z tpowa $ # Maintainer: Tobias Powalowski # Contributor : Murtuza Akhtari # Contributor: Keshav P R pkgname=efibootmgr pkgver=0.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -49,4 +49,4 @@ package() { } md5sums=('cfcf24752d6461b73f7ba964bbf73169' '29730052de0d6911457a26011f8ddb6e' - 'd31f3c378cf8aac57b71620340c68b24') + 'b99b8f79842b96c241a0b0fcfb75c778') diff --git a/extra/efibootmgr/efibootmgr_default_to_grub2.patch b/extra/efibootmgr/efibootmgr_default_to_grub2.patch index 1a1b3c69f..35207298f 100755 --- a/extra/efibootmgr/efibootmgr_default_to_grub2.patch +++ b/extra/efibootmgr/efibootmgr_default_to_grub2.patch @@ -7,7 +7,7 @@ index 199af39..3826e03 100644 - This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi -+ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/grub/grub.efi ++ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/arch_grub/grubx64.efi The EFI_DEVICE_PATH will look something like: ACPI device path, length 12 bytes Hardware Device Path, PCI, length 6 bytes @@ -26,8 +26,8 @@ index 199af39..3826e03 100644 printf("\t-i | --iface name create a netboot entry for the named interface\n"); - printf("\t-l | --loader name (defaults to \\elilo.efi)\n"); - printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); -+ printf("\t-l | --loader name (defaults to \\EFI\\grub\\grub.efi)\n"); -+ printf("\t-L | --label label Boot manager display label (defaults to \"GRUB2\")\n"); ++ printf("\t-l | --loader name (defaults to \\EFI\\arch_grub\\grubx64.efi)\n"); ++ printf("\t-L | --label label Boot manager display label (defaults to \"Arch Linux (GRUB2)\")\n"); printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); printf("\t-N | --delete-bootnext delete BootNext\n"); printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,... explicitly set BootOrder (hex)\n"); @@ -37,8 +37,9 @@ index 199af39..3826e03 100644 opts.edd10_devicenum = 0x80; - opts.loader = "\\elilo.efi"; - opts.label = "Linux"; -+ opts.loader = "\\EFI\\grub\\grub.efi"; -+ opts.label = "GRUB2"; ++ opts.loader = "\\EFI\\arch_grub\\grubx64.efi"; ++ opts.label = "Arch Linux (GRUB2)"; opts.disk = "/dev/sda"; opts.iface = NULL; opts.part = 1; + diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD index 734c0e2fe..37bd25238 100644 --- a/extra/gnome-keyring-sharp/PKGBUILD +++ b/extra/gnome-keyring-sharp/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 150836 2012-02-23 12:21:20Z ibiru $ +# $Id: PKGBUILD 156470 2012-04-18 17:42:37Z daniel $ # Maintainer: Ionut Biru pkgname=gnome-keyring-sharp pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="A fully managed implementation of libgnome-keyring" arch=('i686' 'x86_64') url="http://www.mono-project.com/Libraries" license=('custom') -depends=('ndesk-dbus>=0.4' 'libgnome-keyring') -makedepends=('gtk-sharp-2') +depends=('libgnome-keyring' 'gtk-sharp-2') source=(http://www.go-mono.com/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!libtool') md5sums=('f9a48319f3fe6123017b000d714d68b1') diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index d96900b36..ac7911bb3 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $ +# $Id: PKGBUILD 156459 2012-04-18 12:20:59Z stephane $ # Maintainer: Stéphane Gaudreault -# Maintainer: Allan McRae +# Contributor: Allan McRae # Contributor: Jason Chu pkgname=python -pkgver=3.2.2 -pkgrel=2 +pkgver=3.2.3 +pkgrel=1 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite3' 'valgrind') -optdepends=('tk: for tkinter' 'sqlite3') +makedepends=('tk' 'sqlite' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - gdbm-magic-values.patch) -sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' - '43bfbe3e23360f412b95cb284ff29b2cbe338be9') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823') build() { cd "${srcdir}/Python-${pkgver}" @@ -28,10 +26,6 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - # gdbm has new magic that whichdb does not recognize - # http://bugs.python.org/issue13007 - patch -Np1 -i ../gdbm-magic-values.patch - # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -55,7 +49,8 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ + test_urllib test_uuid test_pydoc } package() { diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index ca0b82db5..ddd7ae1b3 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 153509 2012-03-15 09:58:34Z stephane $ -# Maintainer: Paul Mattal +# $Id: PKGBUILD 156457 2012-04-18 12:20:57Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.7.4 -pkgrel=1 +pkgrel=3 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite3' 'file') +depends=('neon' 'apr-util' 'sqlite' 'file') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'ruby: for some hook scripts') + 'python2: for some hook scripts' 'ruby: for some hook scripts' 'java-environment') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" provides=('svn') -options=('!makeflags' '!libtool') +options=('!makeflags' '!libtool' '!emptydirs') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve svn svnserve.conf subversion.rpath.fix.patch) sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527' @@ -53,7 +54,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ @@ -70,7 +71,10 @@ package() { install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - # bash completion install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/etc/bash_completion.d/subversion + "${pkgdir}"/usr/share/bash-completion/completions/subversion + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done + } -- cgit v1.2.3-54-g00ecf