Update to 7.3.0-3

3 files changed, 13 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5657836be4b..760e202e315b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = packettracer
 	pkgdesc = Cisco PacketTracer 7.3.0 installation package
 	pkgver = 7.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.netacad.com/courses/packet-tracer
-	install = packettracer.install
 	arch = x86_64
 	license = custom
 	options = !strip
@@ -13,8 +12,13 @@ pkgbase = packettracer
 	sha512sums = b06275775703791d56618d99fa7daf29a8a5c82dc17b66d12a9b29927f0a97deb082a757c0cdf72c2345ac32449d0506dad35237ac9935db2e86982e115f1ae1
 	sha512sums = 156579687c5eb63ef2065b28625d9faeee96d2224248c6883a92264f5c0e800c5ab9206ad4c6afebb9dcdbe6b880a9a24caf96044a7c97df743473933fcd2c4d
 	depends = openssl-1.0
-	depends = libpng12
+	depends = dbus
 	depends = icu
+	depends = glib2
+	depends = libxml2
+	depends = java-runtime
+	depends = libjpeg-turbo
+	depends = nss
 
 pkgname = packettracer
 
diff --git a/PKGBUILD b/PKGBUILD
index 94a9bd3c6ca8..b0528797512c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,12 @@
 
 pkgname=packettracer
 pkgver=7.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Cisco PacketTracer 7.3.0 installation package"
 arch=( 'x86_64' )
-depends=('openssl-1.0' 'libpng12' 'icu')
+depends=('openssl-1.0' 'dbus' 'icu' 'glib2' 'libxml2' 'java-runtime' 'libjpeg-turbo' 'nss')
 options=('!strip' '!emptydirs')
 url="https://www.netacad.com/courses/packet-tracer"
-install=${pkgname}.install
 license=('custom')
 
 source=('local://PacketTracer_730_amd64.deb'
@@ -30,12 +29,15 @@ package() {
 	mkdir -p "${pkgdir}/usr/bin/"
 	ln -s ${pkgdir}/opt/packettracer "${pkgdir}/usr/bin/packettracer"
 
+	ln -s /usr/lib/libdouble-conversion.so "${pkgdir}/opt/packettracer/bin/libdouble-conversion.so.1"
+
 	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/opt/packettracer/linguist"
 	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/opt/packettracer/packettracer"
 	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/opt/packettracer/bin/Cisco-PacketTracer.desktop"
 	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/cisco-pt7.desktop"
-	rm "${pkgdir}/usr/share/applications/cisco-ptsa7.desktop"
+	sed 's/\/opt\/pt/\/opt\/packettracer/' -i "${pkgdir}/usr/share/applications/cisco-ptsa7.desktop"
 	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-pt7.desktop"
+	sed -e "\$aCategories=Application;Network;" -i "${pkgdir}/usr/share/applications/cisco-ptsa7.desktop"
 
 	install -D -m755 "${srcdir}/packettracer.sh" "${pkgdir}/etc/profile.d/packettracer.sh"
 
diff --git a/packettracer.install b/packettracer.install
deleted file mode 100644
index 85f768a4b658..000000000000
--- a/packettracer.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-if [ ! -f "/usr/lib/libdouble-conversion.so.1" ]; then
-	if [ ! -f "/opt/packettracer/bin/libdouble-conversion.so.1" ]; then
-	ln -s /usr/lib/libdouble-conversion.so /opt/packettracer/bin/libdouble-conversion.so.1
-	fi
-fi
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-if [ -f "/opt/packettracer/bin/libdouble-conversion.so.1" ]; then
-    rm /opt/packettracer/bin/libdouble-conversion.so.1
-fi
-}