diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
| commit | a3484d36d471110db6eb07c1bcac535fa312a0a4 (patch) | |
| tree | ae5757a526845753f943a04ab06e34d198aba78d /core/file | |
| parent | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (diff) | |
| parent | 8784d3134c1d4b4c02d705259ae2ebd768c778fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/addresses/PKGBUILD
community-testing/gcc-avr/PKGBUILD
community-testing/gnumail/PKGBUILD
community-testing/gnustep-back/PKGBUILD
community-testing/gnustep-base/PKGBUILD
community-testing/gnustep-gui/PKGBUILD
community-testing/llvm/PKGBUILD
community-testing/systemd/PKGBUILD
community/llvm/PKGBUILD
community/lua-yajl-git/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/python-scipy/PKGBUILD
community/virtualbox/PKGBUILD
core/bin86/PKGBUILD
core/cloog-ppl/PKGBUILD
core/gcc/PKGBUILD
core/mpfr/PKGBUILD
extra/ilmbase/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kdepim/PKGBUILD
extra/latex2html/PKGBUILD
extra/libmad/PKGBUILD
extra/postgresql/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc-go.install
testing/bin86/PKGBUILD
testing/binutils/PKGBUILD
testing/coreutils/PKGBUILD
testing/glibc/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/less/PKGBUILD
testing/linux-api-headers/PKGBUILD
testing/mdadm/PKGBUILD
testing/mpfr/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'core/file')
| -rw-r--r-- | core/file/PKGBUILD | 17 | ||||
| -rw-r--r-- | core/file/file-5.05-python-3.2.patch | 11 |
2 files changed, 6 insertions, 22 deletions
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 663da6359..1a6960643 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111169 2011-02-24 15:25:47Z stephane $ +# $Id: PKGBUILD 119819 2011-04-15 12:49:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.05 -pkgrel=2 +pkgver=5.06 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,11 +13,9 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch - file-5.05-python-3.2.patch) -md5sums=('0b429063710457be2bd17a18389cb018' - '385f020467debd98bd2d8df6143f93d0' - '3f5e147be5b9c36c74323a1317328538') + file-5.05-zip64.patch) +md5sums=('deb12b0fb9d09e7681be72bad6eba4e0' + '385f020467debd98bd2d8df6143f93d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,9 +24,6 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - # identify python 3.2 files - patch -Np1 -i ../file-5.05-python-3.2.patch - ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/file/file-5.05-python-3.2.patch b/core/file/file-5.05-python-3.2.patch deleted file mode 100644 index 355eb08a6..000000000 --- a/core/file/file-5.05-python-3.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur file-5.05.ori/magic/Magdir/python file-5.05/magic/Magdir/python ---- file-5.05.ori/magic/Magdir/python 2010-12-31 10:15:28.000000000 -0800 -+++ file-5.05/magic/Magdir/python 2011-02-24 07:07:36.030004467 -0800 -@@ -20,6 +20,7 @@ - 0 belong 0x03f30d0a python 2.7 byte-compiled - 0 belong 0x3b0c0d0a python 3.0 byte-compiled - 0 belong 0x4f0c0d0a python 3.1 byte-compiled -+0 belong 0x6c0c0d0a python 3.2 byte-compiled - - 0 search/1/w #!\ /usr/bin/python Python script text executable - !:mime text/x-python |