Update to 6.3-2

5 files changed, 35 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30ba104c5971..2921768d9be6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
-# Generated by makepkg 4.2.1
-# Sat Sep  5 11:32:30 UTC 2015
 pkgbase = packettracer
 	pkgdesc = Network design and emulation software for Cisco's Networking Academy instructors and students.
 	pkgver = 6.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.netacad.com/about-networking-academy/packet-tracer
 	install = pt.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = gcc-multilib
 	options = !strip
-	source = https://archive.org/download/PacketTracer63Linux/PacketTracer63_linux.tar.gz
+	source = http://PacketTracer63_linux.tar.gz
 	source = packettracer
 	source = linguist
-	sha512sums = cd66b6821e9b2fe93e77c45788ff4189ff39af75ad8f492168751c19dc872c501255a44d2324e9506717c839884ca2cbcb9f2e03c47c27e4e5ff2eeda7842ed9
-	sha512sums = 0cf78b00428e5a795a29704eacaef1dbf2f93e0758b1e8341c79839ecb699022f0b9d2ba0b9bdbf196ed362fc708ec347624ba7b29033b18f865df0e93c858d3
-	sha512sums = 2fe30ef63d29903addbe3042aa505e9b1497ce2abc935855c062de1e2582a66425f10844ad38309ad099805a58ed89e47e78c2a943fc45a87d809eb0dfae39a3
+	source = packettracer.sh
+	sha512sums = f9c8f5d661d7b812f53e83d87b3cb9d486d51c009c8b840a1dadcf3953b777234af4e243a22b603e6dda42a3961259bd130807fa3f8e9703838b77285f3a5fe6
+	sha512sums = 8798b38d02268805554e019984418578d7ec94b727f9261b1abbc57651b8d9108414b19fb0b59aa7dd4764c5ca269e5fb30465162ed8e6debf1efab5a868ab24
+	sha512sums = bd800d5335e54436f760e4a21a381c5cca4752c864c559ebc302bdcfc9819a3cf76fecc3b1490fdfd18d0f98e14c0886d8c6b7776dd3814af7ade17b9c85d80a
+	sha512sums = 3f4732213a9ca7c95f742edbdccf4d84c95e1c9e00d3dfa72e79b8039ef86bed29bc5b76586402a233ce3af409c0a56c759c2554e17962c292a6bd333654ce71
 	depends_i686 = qtwebkit
 	depends_i686 = libpng
 	depends_x86_64 = lib32-openssl
 	depends_x86_64 = lib32-qt4
 	depends_x86_64 = lib32-libpng
+	makedepends_x86_64 = gcc-multilib
 
 pkgname = packettracer
 
diff --git a/PKGBUILD b/PKGBUILD
index 56890041a8e1..475399a74302 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=packettracer
 pkgver=6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Network design and emulation software for Cisco's Networking Academy instructors and students."
 arch=( 'i686' 'x86_64' )
 depends_x86_64=('lib32-openssl' 'lib32-qt4' 'lib32-libpng') && makedepends_x86_64=('gcc-multilib')
@@ -15,9 +15,9 @@ depends_i686=('qtwebkit' 'libpng')
 url="http://www.netacad.com/about-networking-academy/packet-tracer"
 license=('custom')
 
-source=( 'https://archive.org/download/PacketTracer63Linux/PacketTracer63_linux.tar.gz' 'packettracer' 'linguist' 'packettracer.sh')
-sha512sums=('cd66b6821e9b2fe93e77c45788ff4189ff39af75ad8f492168751c19dc872c501255a44d2324e9506717c839884ca2cbcb9f2e03c47c27e4e5ff2eeda7842ed9' '0cf78b00428e5a795a29704eacaef1dbf2f93e0758b1e8341c79839ecb699022f0b9d2ba0b9bdbf196ed362fc708ec347624ba7b29033b18f865df0e93c858d3' '2fe30ef63d29903addbe3042aa505e9b1497ce2abc935855c062de1e2582a66425f10844ad38309ad099805a58ed89e47e78c2a943fc45a87d809eb0dfae39a3'
-'e264a4153bf2ef33fa9d3543f4fedd33740b1f3bd8c59fc9dd0d26caa843488704a8e68362e8ec7ff66f19d5a3dbb56912a09ac05bf18be1999f4bb18f262b38')
+source=( 'http://PacketTracer63_linux.tar.gz' 'packettracer' 'linguist' 'packettracer.sh')
+sha512sums=('f9c8f5d661d7b812f53e83d87b3cb9d486d51c009c8b840a1dadcf3953b777234af4e243a22b603e6dda42a3961259bd130807fa3f8e9703838b77285f3a5fe6' '8798b38d02268805554e019984418578d7ec94b727f9261b1abbc57651b8d9108414b19fb0b59aa7dd4764c5ca269e5fb30465162ed8e6debf1efab5a868ab24' 'bd800d5335e54436f760e4a21a381c5cca4752c864c559ebc302bdcfc9819a3cf76fecc3b1490fdfd18d0f98e14c0886d8c6b7776dd3814af7ade17b9c85d80a'
+'3f4732213a9ca7c95f742edbdccf4d84c95e1c9e00d3dfa72e79b8039ef86bed29bc5b76586402a233ce3af409c0a56c759c2554e17962c292a6bd333654ce71')
 
 # We don't want to strip anything from the static libraries
 # We want to keep all binaries orginal (Cisco is goofy)
@@ -27,29 +27,29 @@ install=pt.install
 package() {
   cd ${srcdir}/PacketTracer63
 
-  mkdir -p ${pkgdir}/opt/pt/{art,backgrounds,bin,extensions,help,LANGUAGES,lib,saves,sounds,templates}
+  mkdir -p ${pkgdir}usr/share/packettracer/{art,backgrounds,bin,extensions,help,LANGUAGES,lib,saves,sounds,templates}
 
-  cp -r ./art/* ${pkgdir}/opt/pt/art
-  cp -r ./backgrounds/* ${pkgdir}/opt/pt/backgrounds
-  cp -r ./bin/* ${pkgdir}/opt/pt/bin
-  cp -r ./extensions/* ${pkgdir}/opt/pt/extensions
-  cp -r ./LANGUAGES/* ${pkgdir}/opt/pt/LANGUAGES
-  cp -r ./saves/* ${pkgdir}/opt/pt/saves
-  cp -r ./sounds/* ${pkgdir}/opt/pt/sounds
-  cp -r ./templates/* ${pkgdir}/opt/pt/templates
-  cp -r ./lib/* ${pkgdir}/opt/pt/lib
+  cp -r ./art/* ${pkgdir}/usr/share/packettracer/art
+  cp -r ./backgrounds/* ${pkgdir}/usr/share/packettracer/backgrounds
+  cp -r ./bin/* ${pkgdir}//usr/share/packettracer/bin
+  cp -r ./extensions/* ${pkgdir}/usr/share/packettracer/extensions
+  cp -r ./LANGUAGES/* ${pkgdir}/usr/share/packettracer/LANGUAGES
+  cp -r ./saves/* ${pkgdir}/usr/share/packettracer/saves
+  cp -r ./sounds/* ${pkgdir}/usr/share/packettracer/sounds
+  cp -r ./templates/* ${pkgdir}/usr/share/packettracer/templates
+  cp -r ./lib/* ${pkgdir}/usr/share/packettracer/lib
 
   # Help Files that are optinal uncomment to include them (55 MB)
-  # cp -r ./help/* ${pkgdir}/opt/pt/help
+  # cp -r ./help/* ${pkgdir}/usr/share/packettracer/help
 
   # Mime Info for PKA, PKT, PKZ
   install -D -m644 ./bin/Cisco-pka.xml ${pkgdir}/usr/share/mime/packages/Cisco-pka.xml
   install -D -m644 ./bin/Cisco-pkt.xml ${pkgdir}/usr/share/mime/packages/Cisco-pkt.xml
   install -D -m644 ./bin/Cisco-pkz.xml ${pkgdir}/usr/share/mime/packages/Cisco-pkz.xml
 
-  rm ${pkgdir}/opt/pt/bin/Cisco-pka.xml
-  rm ${pkgdir}/opt/pt/bin/Cisco-pkt.xml
-  rm ${pkgdir}/opt/pt/bin/Cisco-pkz.xml
+  rm ${pkgdir}/usr/share/packettracer/bin/Cisco-pka.xml
+  rm ${pkgdir}/usr/share/packettracer/bin/Cisco-pkt.xml
+  rm ${pkgdir}/usr/share/packettracer/bin/Cisco-pkz.xml
 
   # Install Mimetype Icons
   install -D -m644 ./art/pka.png ${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-pka.png
@@ -61,14 +61,14 @@ package() {
 
   # Shell script to start PT and tell it to use included qt files
   # Arch's QT causes PT to crash when saving!
-  install -D -m755 ${srcdir}/packettracer ${pkgdir}/opt/pt/packettracer
+  install -D -m755 ${srcdir}/packettracer ${pkgdir}/usr/share/packettracer/packettracer
 
   # Symlink to /usr/bin
   mkdir -p ${pkgdir}/usr/bin/
-  ln -s /opt/pt/packettracer ${pkgdir}/usr/bin/packettracer
+  ln -s /usr/share/packettracer/packettracer ${pkgdir}/usr/bin/packettracer
 
   # Improved version of Cisco's linguist script
-  install -D -m755 ${srcdir}/linguist ${pkgdir}/opt/pt/linguist
+  install -D -m755 ${srcdir}/linguist ${pkgdir}/usr/share/packettracer/linguist
 
   # Add enviroment variable
   install -D -m755 ${srcdir}/packettracer.sh ${pkgdir}/etc/profile.d/packettracer.sh
@@ -76,6 +76,6 @@ package() {
   # Desktop File
   install -D -m644 ./bin/Cisco-PacketTracer.desktop ${pkgdir}/usr/share/applications/Cisco-PacketTracer.desktop
   sed 's/\/usr\/local\/PacketTracer6/\/opt\/pt/' -i ${pkgdir}/usr/share/applications/Cisco-PacketTracer.desktop 
-  rm ${pkgdir}/opt/pt/bin/Cisco-PacketTracer.desktop
+  rm ${pkgdir}/usr/share/packettracer/bin/Cisco-PacketTracer.desktop
 }
 
diff --git a/linguist b/linguist
index be7911a84206..d4609f556b67 100755
--- a/linguist
+++ b/linguist
@@ -4,7 +4,7 @@
 # If you exprerience any troubles, try to uncomment
 # the following line        
 
-export LD_LIBRARY_PATH="/opt/pt/lib" 
+export LD_LIBRARY_PATH="/usr/share/packettracer/lib" 
 
-/opt/pt/bin/linguist "$@"
+/usr/share/packettracer/bin/linguist "$@"
 
diff --git a/packettracer b/packettracer
index 9d747f936883..9ded7b1e6749 100755
--- a/packettracer
+++ b/packettracer
@@ -6,7 +6,7 @@
 # If you exprerience any troubles, try to uncomment
 # the following line
 
-export LD_LIBRARY_PATH="/opt/pt/lib"
+export LD_LIBRARY_PATH="/usr/share/packettracer/lib"
 
-exec /opt/pt/bin/PacketTracer6 "$@"
+exec /usr/share/packettracer/bin/PacketTracer6 "$@"
 
diff --git a/packettracer.sh b/packettracer.sh
index 8c4abc2a23e7..9e3c2f3d49fc 100755
--- a/packettracer.sh
+++ b/packettracer.sh
@@ -1 +1 @@
-export PT_HOME=/opt/pt
+export PT_HOME=/usr/share/packettracer