changed install and upped version to 4.0.6

4 files changed, 37 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96616e109f0e..8dfece3df6b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 # Generated by mksrcinfo v8
-# Wed May 25 07:35:39 UTC 2016
+# Wed May 31 12:21:08 UTC 2017
 pkgbase = plecs-standalone
 	pkgdesc = A Circuit simulation tool written by plexim (license needed, only demo mode available otherwise)
-	pkgver = v3.7.5
+	pkgver = v4.0.6
 	pkgrel = 1
 	url = http://www.plexim.com/de/products/plecs_standalone
 	arch = x86_64
-	arch = i686
 	license = custom
-	makedepends = findutils
+	makedepends = coreutils
 	depends = qt4
 	depends = ncurses5-compat-libs
 	provides = plecs-standalone
 	source = plecs.desktop
-	md5sums = 6a70b9891052f0a18e56565f81182a2d
-	source_x86_64 = plecs-standalone-v3.7.5-x86_64.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-3-7-5_linux64.tar.gz
-	md5sums_x86_64 = 3b4c9e61c7284e5431810c832fba1dd8
-	sha1sums_x86_64 = 0aa7448b450f38a1ab2f0471f4efe4652feabd7b
-	source_i686 = plecs-standalone-v3.7.5-i686.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-3-7-5_linux32.tar.gz
-	md5sums_i686 = e8e13583c1b047b0eddad40f95a36aea
-	sha1sums_i686 = 289b407fa089f1d89c8b178b60fa6e5d6d6d799a
+	source = plecs.sh
+	source = plecs-standalone-v4.0.6-x86_64.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-4-0-6_linux64.tar.gz
+	md5sums = 1304e0fb305fbaa4f7725dde65b646f8
+	md5sums = 9d22a86f620506b3e5768d54e338af5d
+	md5sums = 26b6e7679c7253721b32101a3050cb0d
+	sha1sums = 21635d737fcb2ec287eb195e2f75b2f895fd032f
+	sha1sums = 5e708849ba6a5fbb55bcbf97debfca3168230c63
+	sha1sums = 2a99411ec2329483487362918f29b9a1d8682842
 
 pkgname = plecs-standalone
 
diff --git a/PKGBUILD b/PKGBUILD
index 4ea9a3ad2fb9..04a8fcc48c93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,70 +3,38 @@
 
 pkgname=plecs-standalone
 _pkgname="plecs"
-pkgver=v3.7.5
+pkgver=v4.0.6
 pkgrel=1
 pkgdesc="A Circuit simulation tool written by plexim (license needed, only demo mode available otherwise)"
 url='http://www.plexim.com/de/products/plecs_standalone'
 
-arch=('x86_64' 'i686')
+arch=('x86_64')
 license=('custom')
 provides=('plecs-standalone')
 depends=('qt4' 'ncurses5-compat-libs')
-makedepends=('findutils')
+makedepends=('coreutils')
 
-source=("plecs.desktop")
-md5sums=('6a70b9891052f0a18e56565f81182a2d')
-
-source_x86_64=("$pkgname-$pkgver-x86_64.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-3-7-5_linux64.tar.gz")
-md5sums_x86_64=('3b4c9e61c7284e5431810c832fba1dd8')
-sha1sums_x86_64=('0aa7448b450f38a1ab2f0471f4efe4652feabd7b')
-
-source_i686=("$pkgname-$pkgver-i686.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-3-7-5_linux32.tar.gz")
-md5sums_i686=('e8e13583c1b047b0eddad40f95a36aea')
-sha1sums_i686=('289b407fa089f1d89c8b178b60fa6e5d6d6d799a')
+source=("plecs.desktop" "plecs.sh" "$pkgname-$pkgver-x86_64.tar.gz::https://www.plexim.com/sites/default/files/packages/plecs-standalone-4-0-6_linux64.tar.gz")
+md5sums=('1304e0fb305fbaa4f7725dde65b646f8' '9d22a86f620506b3e5768d54e338af5d' '26b6e7679c7253721b32101a3050cb0d')
+sha1sums=('21635d737fcb2ec287eb195e2f75b2f895fd032f' '5e708849ba6a5fbb55bcbf97debfca3168230c63' '2a99411ec2329483487362918f29b9a1d8682842')
 
 package() {
-	# desktop file
 	mkdir -p "$pkgdir/usr/share/applications/"
-	install -m 664 plecs.desktop "$pkgdir/usr/share/applications/"
-
-	cd "$_pkgname"
+	mkdir -p "$pkgdir/opt/plecs"
 	mkdir -p "$pkgdir/usr/bin"
-	mkdir -p "$pkgdir/usr/share/plecs/"
-	mkdir -p "$pkgdir/usr/share/plecs/private"
 	mkdir -p "$pkgdir/usr/share/licenses/plecs"
 
-	install -m 664 license.txt 		"$pkgdir/usr/share/licenses/plecs/LICENSE"
-	install -m 664 Components.plecs 	"$pkgdir/usr/share/plecs/"
-	install -m 664 Deprecated.plecs 	"$pkgdir/usr/share/plecs/"
-	install -m 775 PLECS.bin 		"$pkgdir/usr/share/plecs/plecs"
-	install -m 775 crashreporter.bin 	"$pkgdir/usr/share/plecs/crashreporter"
-
-	# private dir
-	install -m 775 "private/plecs.oct" 	"$pkgdir/usr/share/plecs/private/"
-	install -m 664 private/*.m 		"$pkgdir/usr/share/plecs/private/"
-
-	# include dir	
-	cp include "$pkgdir/usr/share/plecs/include" -r
-
-	cp plugins "$pkgdir/usr/share/plecs/" -r
-	find "$pkgdir/usr/share/plecs/plugins" -type f -exec chmod 775 {} +
-
-	cp onlinehelp "$pkgdir/usr/share/plecs/" -r
-	find "$pkgdir/usr/share/plecs/onlinehelp" -type f -exec chmod 664 {} +
-
-	cp pilframeworks "$pkgdir/usr/share/plecs/" -r 
-	find "$pkgdir/usr/share/plecs/pilframeworks" -type f -exec chmod 775 {} +
+	# desktop file
+	echo "install plecs.desktop"
+	install -m 664 "$srcdir/plecs.desktop" "$pkgdir/usr/share/applications/"
 
-	
-	cp octave 	"$pkgdir/usr/share/plecs/" -r
-	cp demos 	"$pkgdir/usr/share/plecs/" -r 
+	echo "install start script"
+	install -m 555 "$srcdir/plecs.sh" "$pkgdir/usr/bin/plecs"
 
-	find "$pkgdir/usr/share/plecs/demos" -type f -exec chmod 664 {} +
-	
-	echo '#!/bin/sh' > plecs
-	echo 'cd /usr/share/plecs/' >> plecs
-	echo 'exec ./plecs' >> plecs
+	echo "install license.txt"
+	install -m 664 "$srcdir/plecs/license.txt" "$pkgdir/usr/share/licenses/plecs/"
 	
-	install -m 775 -t "$pkgdir/usr/bin/" plecs 
+	echo "copying plecs dir"
+	rm "$srcdir/plecs/PLECS"
+	cp "$srcdir/plecs/." "$pkgdir/opt/plecs" -r 
 }
diff --git a/plecs.desktop b/plecs.desktop
index 5edb7cfda79b..1f0531b45a73 100644
--- a/plecs.desktop
+++ b/plecs.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Version=3.7.5                    
+Version=4.0.6                   
 Name=plecs                            
 Comment=circuit simulator for power circuits   
-Path=/usr/share/plecs                       
+Path=/opt/plecs
 Exec=plecs %U
-Terminal=false                            
+Terminal=false                       
 Categories=Education;Office;NumericalAnalysis      
 
diff --git a/plecs.sh b/plecs.sh
new file mode 100644
index 000000000000..9f3e02efecc4
--- /dev/null
+++ b/plecs.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=/opt/plecs/
+unset QT_PLUGIN_PATH
+
+exec /opt/plecs/PLECS.bin