[arch-commits] Commit in abs/repos (4 files)

[Travis Willard]

    Date: Tuesday, April 15, 2008 @ 22:23:05
  Author: travis
Revision: 292

Merged revisions 2-291 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/abs/trunk

........
  r179 | travis | 2008-04-12 15:07:56 -0400 (Sat, 12 Apr 2008) | 1 line
  
  upgpkg: abs 2.0-1
........
  r239 | travis | 2008-04-13 21:20:52 -0400 (Sun, 13 Apr 2008) | 2 lines
  
  upgpkg: abs 2.0-2
      Small fixes
........
  r242 | travis | 2008-04-13 21:22:18 -0400 (Sun, 13 Apr 2008) | 2 lines
  
  upgpkg: abs 2.0-2
      Small fixes
........
  r267 | travis | 2008-04-14 11:56:52 -0400 (Mon, 14 Apr 2008) | 1 line
  
  Simple test to check commit messages
........
  r268 | travis | 2008-04-14 11:59:02 -0400 (Mon, 14 Apr 2008) | 1 line
  
  Simple test to check commit messages
........
  r269 | travis | 2008-04-14 11:59:50 -0400 (Mon, 14 Apr 2008) | 1 line
  
  Simple test to check commit messages
........
  r289 | travis | 2008-04-15 22:20:16 -0400 (Tue, 15 Apr 2008) | 2 lines
  
  upgpkg: abs 2.0-3
      Update with install message and move to core
........
  r291 | travis | 2008-04-15 22:22:14 -0400 (Tue, 15 Apr 2008) | 2 lines
  
  upgpkg: abs 2.0-3
      Update with install message and move to core
........

Added:
  abs/repos/core-x86_64/ChangeLog
    (from rev 291, abs/trunk/ChangeLog)
  abs/repos/core-x86_64/abs.install
    (from rev 291, abs/trunk/abs.install)
Modified:
  abs/repos/core-x86_64/	(properties)
  abs/repos/core-x86_64/PKGBUILD

-------------+
 ChangeLog   |   17 +++++++++++++++++
 PKGBUILD    |   27 +++++++++++++--------------
 abs.install |   10 ++++++++++
 3 files changed, 40 insertions(+), 14 deletions(-)


Property changes on: abs/repos/core-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /abs/trunk:1
   + /abs/trunk:1-291

Copied: abs/repos/core-x86_64/ChangeLog (from rev 291, abs/trunk/ChangeLog)
===================================================================
--- core-x86_64/ChangeLog	                        (rev 0)
+++ core-x86_64/ChangeLog	2008-04-16 02:23:05 UTC (rev 292)
@@ -0,0 +1,17 @@
+2008-04-15 Travis Willard <travis at archlinux.org>
+
+	* 2.0-3
+	Added install message
+	Moved abs.conf to /etc instead of /etc/abs
+
+2008-04-13 Travis Willard <travis at archlinux.org>
+
+	* 2.0-2
+	Moved rsyncd.conf.abs to /usr/share/abs
+	Made rsync server configurable
+
+2008-04-10 Travis Willard <travis at archlinux.org>
+
+	* 2.0-1
+	Added ChangeLog
+	New rsync-based release

Modified: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2008-04-16 02:22:14 UTC (rev 291)
+++ core-x86_64/PKGBUILD	2008-04-16 02:23:05 UTC (rev 292)
@@ -3,33 +3,32 @@
 # Maintainer: Travis Willard <travis at archlinux.org>	
 
 pkgname=abs
-pkgver=1.0
-pkgrel=1
+pkgver=2.0
+pkgrel=3
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64')
 url="http://projects.archlinux.org/git/?p=abs.git"
 license=('GPL')
+depends=('bash' 'rsync')
 groups=('base-devel')
-depends=('bash' 'csup')
-backup=(etc/abs/abs.conf 
-				etc/abs/supfile.{core,extra,community,testing,unstable} )
+backup=(etc/abs.conf)
+install=abs.install
 source=(ftp://ftp.archlinux.org/other/abs/$pkgname-$pkgver.tar.gz)
-md5sums=('7867aad8f8876c4119fa508a473bcdc9')
+md5sums=('559049b56b7de70f4824c20785835194')
 
 build() {
   cd $startdir/src/$pkgname
-  
-  make DESTDIR=$startdir/pkg install || return 1
 
-	# Add readme file, and make base /var/abs path
-	mkdir -p /var/abs
-	install -Dm0644 $startdir/src/abs/README $startdir/pkg/var/abs/README
+  make CONFDIR=/etc/ || return 1
+  make CONFDIR=/etc/ DESTDIR=$startdir/pkg install || return 1
 
+  # Add readme file, and make base /var/abs path
+  install -dm0755 $startdir/pkg/var/abs/local/
+  install -Dm0644 $startdir/src/abs/README $startdir/pkg/var/abs/README
+
   # change ABS tags for x86_64 to correct values
   if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s|CURRENT|CURRENT-64|g" \
-        $startdir/pkg/etc/abs/supfile.{core,extra,community,unstable}
-    sed -i "s|TESTING|TESTING-64|g" $startdir/pkg/etc/abs/supfile.testing
+    sed -i "s|i686|x86_64|g" $startdir/pkg/etc/abs.conf
   fi
 }
 

Copied: abs/repos/core-x86_64/abs.install (from rev 291, abs/trunk/abs.install)
===================================================================
--- core-x86_64/abs.install	                        (rev 0)
+++ core-x86_64/abs.install	2008-04-16 02:23:05 UTC (rev 292)
@@ -0,0 +1,10 @@
+## arg 1:  the new package version
+## arg 2:  the old package version
+pre_upgrade() {
+  if [ "$(vercmp $2 2.0-1)" -lt 0 ]; then
+    echo "==> ABS now uses rsync, instead of cvsup, to synchronize your tree."
+    echo "==> Please note the new configuration in /etc/abs.conf"
+  fi
+}
+
+# vim:set ts=2 sw=2 et: