Bump to pre5 version and add install script thanks to @Rucikir for the sugestions

3 files changed, 24 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66dbfc22bca7..3d2199b11902 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = omnetpp-qt
 	pkgdesc = OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version
-	pkgver = 6.0pre4
+	pkgver = 6.0pre5
 	pkgrel = 1
 	url = http://www.omnetpp.org
+	install = omnetpp-qt.install
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -21,7 +22,7 @@ pkgbase = omnetpp-qt
 	depends = tcl
 	depends = tk
 	depends = blt
-	depends = jdk8-openjdk
+	depends = jdk-openjdk
 	depends = openmpi
 	depends = libpcap
 	depends = doxygen
@@ -33,10 +34,10 @@ pkgbase = omnetpp-qt
 	conflicts = omnetpp
 	source = OMNeT++.desktop
 	source = omnetpp.sh
-	source = omnetpp-6.0pre4-src-linux.tgz::https://github.com/omnetpp/omnetpp/releases/download/omnetpp-6.0pre4/omnetpp-6.0pre4-src-linux.tgz
+	source = omnetpp-6.0pre5-src-linux.tgz::https://github.com/omnetpp/omnetpp/releases/download/omnetpp-6.0pre5/omnetpp-6.0pre5-src-linux.tgz
 	sha512sums = a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
-	sha512sums = 5b4d331ee9c81f8d22f6d204e9b2622755e1564fc786c4328d7a28c7b71592dd556b58eb94ba929a7a91bf714d0f43cde0006bfe2d9fc1a99bc2007551055234
+	sha512sums = aa5a93dceb0f20c41b10d5c529d6e3d837ed7f200f0b9cba274c1b91f07ab1cfaf499473dcb6591a9e9357b8465b92e06b7831ad66b04f564a1bc6bfdc61cacc
 
 pkgname = omnetpp-qt
 
diff --git a/PKGBUILD b/PKGBUILD
index 99659c2fbc5d..c225a4757cf4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,34 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
 
 pkgname='omnetpp-qt'
-pkgver=6.0pre4
-_pkgver=6-0pre4
+pkgver=6.0pre5
 pkgrel=1
 _pkgname='omnetpp'
 pkgdesc='OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version'
 url='http://www.omnetpp.org'
 license=('custom')
-depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang openscenegraph)
+depends=(libxml2 qt5-base tcl tk blt jdk-openjdk openmpi libpcap doxygen graphviz clang openscenegraph)
 makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph blt)
 optdepends=(osgearth)
 arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
+install=omnetpp-qt.install
 
 source=(OMNeT++.desktop
-	omnetpp.sh
-	"omnetpp-${pkgver}-src-linux.tgz::https://github.com/omnetpp/omnetpp/releases/download/omnetpp-6.0pre4/omnetpp-${pkgver}-src-linux.tgz")
+        omnetpp.sh
+        "${_pkgname}-${pkgver}-src-linux.tgz::https://github.com/omnetpp/omnetpp/releases/download/omnetpp-${pkgver}/omnetpp-${pkgver}-src-linux.tgz")
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
-'5b4d331ee9c81f8d22f6d204e9b2622755e1564fc786c4328d7a28c7b71592dd556b58eb94ba929a7a91bf714d0f43cde0006bfe2d9fc1a99bc2007551055234')
+            'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
+            'aa5a93dceb0f20c41b10d5c529d6e3d837ed7f200f0b9cba274c1b91f07ab1cfaf499473dcb6591a9e9357b8465b92e06b7831ad66b04f564a1bc6bfdc61cacc')
 
 build() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	echo WITH_OSGEARTH=no >> configure.user
 	# Fix configure script
 	sed -i "2152 a ac_configure_args=$(echo $ac_configure_args | sed s/\'//g)" configure
-	./configure --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib	
+	./configure --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib
 	PATH=${srcdir}/${_pkgname}-${pkgver}/bin:$PATH
 	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${pkgver}/lib:$LD_LIBRARY_PATH
 	make
@@ -37,7 +37,7 @@ build() {
 package() {
 	# Install build to /opt
 	cd ${srcdir}
-	mkdir -p "${pkgdir}"/opt 
+	mkdir -p "${pkgdir}"/opt
 	mv  "${_pkgname}-${pkgver}" ${pkgdir}/opt/${_pkgname} || return 1
 
 	# run OMNeT++ as a normal user
diff --git a/omnetpp-qt.install b/omnetpp-qt.install
new file mode 100644
index 000000000000..339699f84c4d
--- /dev/null
+++ b/omnetpp-qt.install
@@ -0,0 +1,10 @@
+post_install() {
+  	echo 'You need to source /etc/profile or relogin to add the Omnet++ tools to your path.'
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+}