From 6cf70d41be9abf69b6d19fbb4ce665c76db3a6c6 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Fri, 20 May 2011 22:47:13 +0000
Subject: Fri May 20 22:47:13 UTC 2011

---
 core/file/PKGBUILD                   | 12 +++++++-----
 core/file/file-5.07-zip-detect.patch | 13 +++++++++++++
 core/grep/PKGBUILD                   | 10 +++++++---
 core/grep/grep.install               |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 core/file/file-5.07-zip-detect.patch

(limited to 'core')

diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index be9e1c172..9869a976c 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $
+# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
 pkgver=5.07
-pkgrel=1
+pkgrel=3
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,9 +13,11 @@ 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-zip64.patch
+        file-5.07-zip-detect.patch)
 md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
-         '385f020467debd98bd2d8df6143f93d0')
+         '385f020467debd98bd2d8df6143f93d0'
+         'bcbf2e152f38003a2736298bbd0f37f8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,7 +25,7 @@ build() {
 
   # identify zip64 files
   patch -Np1 -i ${srcdir}/file-5.05-zip64.patch
-
+  patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
   ./configure --prefix=/usr --datadir=/usr/share/file
   make 
 }
diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch
new file mode 100644
index 000000000..3e8f128d8
--- /dev/null
+++ b/core/file/file-5.07-zip-detect.patch
@@ -0,0 +1,13 @@
+--- file-5.07/magic/Magdir/archive.old	2011-04-23 17:02:48.000000000 +0200
++++ file-5.07/magic/Magdir/archive	2011-05-15 10:14:44.509271579 +0200
+@@ -654,6 +654,10 @@
+ >>>>78	string	-template		Template
+ !:mime	application/vnd.oasis.opendocument.image-template
+ 
++>26 byte x Zip archive data
++
++
++
+ # StarView Metafile
+ # From Pierre Ducroquet <pinaraf@pinaraf.info>
+ 0	string	VCLMTF	StarView MetaFile
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index a2c47a73c..d2b07cf23 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $
+# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64')
@@ -14,12 +14,16 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('6dd9931a52501519d7779a27cf953326')
+md5sums=('b59003c42b330bdabd417e00d07102da')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --bindir=/bin --without-included-regex
   make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make check
 }
 
diff --git a/core/grep/grep.install b/core/grep/grep.install
index ba97d8994..7cd31301f 100644
--- a/core/grep/grep.install
+++ b/core/grep/grep.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(grep.info)
 
 post_install() {
-- 
cgit v1.2.3-54-g00ecf