Commits

Anonymous committed de95bc1

Move urwid from depends to slack-suggests.
Add makedepends line.
Modify pkgdesc and use external slack-desc.
Move setup.py to top of build().
Put some basic info in slack-changes.

Comments (0)

Files changed (5)

 pkgname=vasm
 pkgver=3.0a0.9
 pkgrel=1
-pkgdesc="Vectorlinux's Administration & System Menu (Alpha release). System configuration
-tool for both TUI and GUI. Complete rewrite of vasm with goals to provide
-greater modularity for maintainability and support for localization and
-internationalization, and tighter integration with the distro installer and the
-system itself. The prior vasm (renamed and moved to vasm-legacy) will remain
-installed on the system for your convenience."
+pkgdesc="Vectorlinux's Administration & System Menu (Alpha release). System configuration tool for both TUI and GUI. Complete rewrite of vasm with goals to provide greater modularity for maintainability and support for localization and internationalization, and tighter integration with the distro installer and the system itself. The prior vasm (renamed and moved to vasm-legacy) will remain installed on the system for your convenience."
 arch=('any')
 url="https://bitbucket.org/m0e_lnx/vasm"
 license=('GPL3')
 depends=( 'python' 'urwid' 'pyparted' 'python-pexpect' 'psutil' 'vasm-legacy' )
 #ADDRB="urwid, pyparted, python-pexpect, psutil, vasm-legacy"
-ADDRB="urwid, pyparted, python-pexpect, psutil"
-optdepends=(	"gparted: Not yet in 64bit repo"
+ADDRB="pyparted, python-pexpect, psutil"
+optdepends=(	"urwid: Needed for tui (commandline) interface"
+		"gparted: Not yet in 64bit repo"
 		"vasm-legacy: The tried and true bash vasm") # Manually mirror to slack-suggests
+makedepends=( 'setuptools' ) # Manually install before buildinging package
 backup=("etc/sudoers.d/vasm")
 changelog="slack-changes"
 _hgrepo="pierce_jason"
 #_hgrepo="m0e_lnx"
 #source=("https://bitbucket.org/$_hgrepo/vasm/downloads/$pkgname-$pkgver.tar.bz2"
 source=("https://bitbucket.org/$_hgrepo/vasm/get/$pkgver.tar.bz2"
+	"slack-desc"
 	"sudoers.d-vasm")
 install="doinst.sh"
-sha256sums=('ed8f036dadec3d9b1d2d1e58b316c05dd46e3b410817b449bccc1556b25fb9de'
+sha256sums=('7270a9027c566751b8a827b671c2a76cc6cb72a02c713d808578f9b5306980fa'
+            '12d54abfa108116446cca9f8e266e8f8c2e071fbbaf44132d1bc3bd3c0260d40'
             'f3cf56b9a9e8578176ca64d5c69e2d8ddec4aa24a9278167a85d9bf915f21bab')
 build() {
-	cd $srcdir/$pkgname-$pkgver;
+	cd $srcdir/$_hgrepo-$pkgname-$pkgver;
+	#cd $srcdir/$pkgname-$pkgver;
+	
+	echo $PWD;ls;
+	python setup.py install --root="$pkgdir/";
 	
 	mkdir -p $pkgdir/usr/doc/$pkgname-$pkgver;
-	cp *.txt $pkgdir/usr/doc/$pkgname-$pkgver;
+	cp *.txt $pkgdir/usr/doc/$pkgname-$pkgver;	
+	cp src/vasm/data/*.txt $pkgdir/usr/doc/$pkgname-$pkgver;
 	cp src/vasm/data/LICENSE $pkgdir/usr/doc/$pkgname-$pkgver;
 
 	cd $srcdir;
+	cp ../slack-{changes,desc} $pkgdir/usr/doc/$pkgname-$pkgver;
 	install -d -m700 $pkgdir/etc/sudoers.d
 	install -m400 sudoers.d-vasm $pkgdir/etc/sudoers.d/
-	
-	python setup.py install --root="$pkgdir/";
 }
 #!/bin/sh
-/usr/share/vasm/setup_logging.sh;
+exec /usr/share/vasm/setup_logging.sh;
+
+echo "See /usr/doc/vasm-*/slack-changes for a brief changelog.";
+* 3.0a1-noarch-1vl70
+	- Full rewrite, using python instead of bash.
+	- Modular code using seperate directories for backend, and gui/tui presentation layers.
+	- All modules must be accessed through `vasm` rather than calling directly.
+	- Main code automatically detects new modules when placed in the correct locations.
+	- Executable moved from /bin to /usr/bin because of dependency on python.
+	- The old vasm is available as /bin/vasm-legacy supplied by the vasm-legacy package.
 * 7.0-noarch-3vl70
 	- Remove etc/sudoers for real this time. Forgot to do the rm on 2vl70.
 	- (* Note prior changes *)
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler-----------------------------------------------------|
+vasm: Vectorlinux's Administration & System Menu (Alpha release)
+vasm:
+vasm: System configuration tool for both TUI and GUI. Complete rewrite of 
+vasm: vasm with goals to provide greater modularity for maintainability and
+vasm: support for localization and internationalization, and tighter 
+vasm: integration with the distro installer and the system itself. The 
+vasm: prior vasm (renamed and moved to vasm-legacy) will remain installed 
+vasm: on the system for your convenience.
+vasm: License: GPL3
+vasm: Authors: Moises Henriquez and Vectorians
+vasm: Website: https://bitbucket.org/m0e_lnx/vasm

_build/slack-suggests

 gparted
 vasm-legacy
+urwid