[arch-commits] Commit in zip/repos (3 files)

[Eric Belanger]

    Date: Sunday, August 10, 2008 @ 23:21:13
  Author: eric
Revision: 8433

fixing svn conflicts

Added:
  zip/repos/extra-x86_64/ChangeLog
    (from rev 8432, zip/trunk/ChangeLog)
Modified:
  zip/repos/extra-x86_64/	(properties)
  zip/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |   13 +++++++++++++
 PKGBUILD  |   18 ++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)


Property changes on: zip/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /zip/trunk:1
   + /zip/trunk:1-8432

Copied: zip/repos/extra-x86_64/ChangeLog (from rev 8432, zip/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-08-11 03:21:13 UTC (rev 8433)
@@ -0,0 +1,13 @@
+2008-08-10  Eric Belanger  <eric at archlinux.org>
+
+	* zip 3.0-1
+	* Removed zcrypt reference as it's now included in zip 3.0
+	* Added bzip2 depends
+	* Added license
+	* FHS man pages
+	* Disabled SMP build
+
+2008-07-27  Douglas Soares de Andrade  <douglas at archlinux.org>
+	
+	* Updating for i686: 3.0
+

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-11 03:19:45 UTC (rev 8432)
+++ extra-x86_64/PKGBUILD	2008-08-11 03:21:13 UTC (rev 8433)
@@ -1,20 +1,22 @@
 # $Id$
 # Maintainer: dorphell <dorphell at archlinux.org>
+
 pkgname=zip
-pkgver=2.32
+pkgver=3.0
 pkgrel=1
 pkgdesc="Creates PKZIP-compatible .zip files"
 arch=(i686 x86_64)
 url="http://www.info-zip.org/pub/infozip/Zip.html"
-depends=('glibc')
+license=('BSD')
+depends=('glibc' 'bzip2')
 makedepends=('unzip')
-source=(http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz \
-        http://ftp.info-zip.org/pub/infozip/src/zcrypt.zip)
-md5sums=('8a4da4460386e324debe97f3b7fe4d96' '0c969ba1661183b041a142945ed2710e')
+options=('!makeflags')
+source=(ftp://ftp.info-zip.org/pub/infozip/src/zip30.zip)
+md5sums=('e88492c8abd68fa9cfba72bc08757dba')
 
 build() {
-   cd $startdir/src/$pkgname-$pkgver
-   echo "A"| unzip ../zcrypt.zip
+   cd $startdir/src/${pkgname}30
    make -f unix/Makefile LOCAL_ZIP="$CFLAGS" prefix=/usr generic_gcc || return 1
-   make -f unix/Makefile INSTALL=`which install` prefix=$startdir/pkg/usr install
+   make -f unix/Makefile INSTALL=`which install` prefix=$startdir/pkg/usr MANDIR=$startdir/pkg/usr/share/man/man1 install
+   install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt
 }