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

[Eric Bélanger]

    Date: Thursday, April 30, 2009 @ 00:02:57
  Author: eric
Revision: 37029

Merged revisions 8432,37028 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/zip/trunk

........
  r8432 | eric | 2008-08-10 23:19:45 -0400 (Sun, 10 Aug 2008) | 2 lines
  
  upgpkg: 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
........
  r37028 | eric | 2009-04-30 00:02:35 -0400 (Thu, 30 Apr 2009) | 1 line
  
  upgpkg: zip 3.0-1.1
........

Modified:
  zip/repos/extra-i686/	(properties)
  zip/repos/extra-i686/ChangeLog
  zip/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    8 ++++++++
 PKGBUILD  |   17 ++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)


Property changes on: zip/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /zip/trunk:1-6707
   + /zip/trunk:1-37028

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-04-30 04:02:35 UTC (rev 37028)
+++ extra-i686/ChangeLog	2009-04-30 04:02:57 UTC (rev 37029)
@@ -1,4 +1,12 @@
+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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-30 04:02:35 UTC (rev 37028)
+++ extra-i686/PKGBUILD	2009-04-30 04:02:57 UTC (rev 37029)
@@ -3,21 +3,20 @@
 
 pkgname=zip
 pkgver=3.0
-pkgrel=1
+pkgrel=1.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=(ftp://ftp.info-zip.org/pub/infozip/src/zip30.zip
-        ftp://ftp.info-zip.org/pub/infozip/src/zcrypt.zip)
+options=('!makeflags')
+source=(ftp://ftp.info-zip.org/pub/infozip/src/zip30.zip)
+md5sums=('e88492c8abd68fa9cfba72bc08757dba')
 
-md5sums=('e88492c8abd68fa9cfba72bc08757dba'
-         '0c969ba1661183b041a142945ed2710e')
-
 build() {
    cd $startdir/src/${pkgname}30
-   echo "A"| unzip ../zcrypt.zip
    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
 }