[arch-commits] Commit in file/trunk (PKGBUILD file-5.07-zip-detect.patch)

[Allan McRae]

    Date: Thursday, August 4, 2011 @ 05:59:01
  Author: allan
Revision: 134479

upgpkg: file 5.08-1
upstream update

Modified:
  file/trunk/PKGBUILD
Deleted:
  file/trunk/file-5.07-zip-detect.patch

----------------------------+
 PKGBUILD                   |   15 +++++----------
 file-5.07-zip-detect.patch |   40 ----------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-04 07:31:32 UTC (rev 134478)
+++ PKGBUILD	2011-08-04 09:59:01 UTC (rev 134479)
@@ -3,8 +3,8 @@
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=file
-pkgver=5.07
-pkgrel=4
+pkgver=5.08
+pkgrel=1
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,17 +12,12 @@
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
 options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz 
-        file-5.07-zip-detect.patch)
-md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
-         'ac155cf89af6665dfee76738c27366d8')
+source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('6a2a263c20278f01fe3bb0f720b27d4e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure 
-
-  # combined upstream patches to fix zip file detection
-  patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
+  sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
   
   ./configure --prefix=/usr --datadir=/usr/share/file
   make 

Deleted: file-5.07-zip-detect.patch
===================================================================
--- file-5.07-zip-detect.patch	2011-08-04 07:31:32 UTC (rev 134478)
+++ file-5.07-zip-detect.patch	2011-08-04 09:59:01 UTC (rev 134479)
@@ -1,40 +0,0 @@
-diff -Naur file-5.07-orig//magic/Magdir/archive file-5.07/magic/Magdir/archive
---- file-5.07-orig//magic/Magdir/archive	2011-04-24 01:02:48.000000000 +1000
-+++ file-5.07/magic/Magdir/archive	2011-07-14 11:55:11.821178049 +1000
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: archive,v 1.63 2011/04/23 15:02:48 christos Exp $
-+# $File: archive,v 1.66 2011/05/25 17:45:54 christos Exp $
- # archive:  file(1) magic for archive formats (see also "msdos" for self-
- #           extracting compressed archives)
- #
-@@ -654,12 +654,6 @@
- >>>>78	string	-template		Template
- !:mime	application/vnd.oasis.opendocument.image-template
- 
--# StarView Metafile
--# From Pierre Ducroquet <pinaraf at pinaraf.info>
--0	string	VCLMTF	StarView MetaFile
-->6	beshort	x	\b, version %d
-->8	belong	x	\b, size %d
--
- #  EPUB (OEBPS) books using OCF (OEBPS Container Format)
- #    From: Adam Buchbinder <adam.buchbinder at gmail.com>
- #    http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
-@@ -692,8 +686,15 @@
- >>4	byte		0x09		\b, at least v0.9 to extract
- >>4	byte		0x0a		\b, at least v1.0 to extract
- >>4	byte		0x0b		\b, at least v1.1 to extract
-->>0x161	string		WINZIP		\b, WinZIP self-extracting
- >>4	byte		0x14		\b, at least v2.0 to extract
-+>>4	byte		0x2d		\b, at least v3.0 to extract
-+>>0x161	string		WINZIP		\b, WinZIP self-extracting
-+
-+# StarView Metafile
-+# From Pierre Ducroquet <pinaraf at pinaraf.info>
-+0	string	VCLMTF	StarView MetaFile
-+>6	beshort	x	\b, version %d
-+>8	belong	x	\b, size %d
- 
- # Zoo archiver
- 20	lelong		0xfdc4a7dc	Zoo archive data