[arch-commits] CVS update of extra/system/devtools (PKGBUILD makepkg3.patch)

[Paul Mattal]

    Date: Monday, September 3, 2007 @ 09:02:56
  Author: paul
    Path: /home/cvs-extra/extra/system/devtools

Modified: PKGBUILD (1.15 -> 1.16) makepkg3.patch (1.2 -> 1.3)

upgpkg: devtools 0.3.4-5
updated patch to also fix checkpkg


----------------+
 PKGBUILD       |   10 ++++-----
 makepkg3.patch |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 5 deletions(-)


Index: extra/system/devtools/PKGBUILD
diff -u extra/system/devtools/PKGBUILD:1.15 extra/system/devtools/PKGBUILD:1.16
--- extra/system/devtools/PKGBUILD:1.15	Tue Jun  5 01:13:44 2007
+++ extra/system/devtools/PKGBUILD	Mon Sep  3 09:02:55 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.15 2007/06/05 05:13:44 aaron Exp $
+# $Id: PKGBUILD,v 1.16 2007/09/03 13:02:55 paul Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=devtools
 pkgver=0.3.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A few tools to help Arch Linux developers"
 arch=(i686 x86_64)
 url=""
 depends=(namcap)
 makedepends=(subversion)
-source=(makepkg3.patch)
-md5sums=('4c7bc6f3681546d845386c89c7559777')
-sha1sums=('e1c66ff0fb9b89d4d8851bdc78aae0b74b4e3cbf')
+source=('makepkg3.patch')
+md5sums=('1b8280b7c9bcfdcb7307b19c64adc763')
+sha1sums=('5f80c6813d8a2c041c6b2627c354d90985d69ee1')
 
 build() {
   cd $startdir/src
Index: extra/system/devtools/makepkg3.patch
diff -u extra/system/devtools/makepkg3.patch:1.2 extra/system/devtools/makepkg3.patch:1.3
--- extra/system/devtools/makepkg3.patch:1.2	Fri May 11 21:25:16 2007
+++ extra/system/devtools/makepkg3.patch	Mon Sep  3 09:02:55 2007
@@ -1,3 +1,63 @@
+Index: checkpkg
+===================================================================
+--- checkpkg	(revision 227)
++++ checkpkg	(working copy)
+@@ -1,5 +1,7 @@
+ #!/bin/bash
+ 
++source /etc/makepkg.conf
++
+ strip_url() {
+ 	echo $1 | sed 's|^.*://.*/||g'
+ }
+@@ -10,12 +12,19 @@
+ fi
+ 
+ source PKGBUILD
++pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
++pkg3file=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+ 
+-if [ ! -f $pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then
++if [ ! -f $pkgfile -a ! -f $pkg3file ]; then
+ 	echo "You must have a built package to check."
+ 	exit 1
+ fi
+ 
++if [ -f $pkg3file -a ! -f $pkgfile ]; then
++	echo "Renaming makepkg3 package for compatability"
++	mv $pkg3file $pkgfile
++fi
++
+ tmp=`pacman -Spd --noconfirm $pkgname`
+ 
+ if [ $? -ne 0 ]; then
+@@ -27,7 +36,7 @@
+ 
+ oldpkg=`strip_url $pkgurl`
+ 
+-if [ "$oldpkg" = "$pkgname-$pkgver-$pkgrel.pkg.tar.gz" ]; then
++if [ "$oldpkg" = "$pkgfile" ]; then
+ 	echo "The built package is the one in the repo right now!"
+ 	exit 1
+ fi
+@@ -41,7 +50,7 @@
+ fi
+ 
+ tar tzf $oldpkg > filelist-old
+-tar tzf $pkgname-$pkgver-$pkgrel.pkg.tar.gz > filelist
++tar tzf $pkgfile > filelist
+ 
+ sort -o filelist filelist
+ sort -o filelist-old filelist-old
+@@ -51,7 +60,7 @@
+ if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
+ 	mkdir -p pkg
+ 	cd pkg
+-	tar xzf ../$pkgname-$pkgver-$pkgrel.pkg.tar.gz > /dev/null
++	tar xzf ../$pkgfile > /dev/null
+ 	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
+ 		echo -n "${i}: "
+ 		objdump -p $i | grep SONAME
 Index: extrapkg
 ===================================================================
 --- extrapkg	(revision 227)