Update to 3.0.2

2 files changed, 30 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c927694c346..91129c16fa79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jan 29 02:57:59 UTC 2016
 pkgbase = nmclient
-	pkgdesc = Novell Messenger client for linux
-	pkgver = 2.2.2
-	pkgrel = 5
+	pkgdesc = Novell Messenger Client for Linux
+	pkgver = 3.0.2
+	pkgrel = 1
 	url = http://gwclient.provo.novell.com/
 	install = nmclient.install
 	arch = i686
@@ -12,13 +14,14 @@ pkgbase = nmclient
 	depends = bash
 	depends = hicolor-icon-theme
 	depends = desktop-file-utils
-	source = https://gwclient.innerweb.novell.com/client/messenger/nvlmsgrlinuxrpm.zip
-	md5sums = b10d0015e76edb50eb169193bc919a5a
-	depends_i686 = java-runtime
+	provides = nmclient
+	source = https://gwclient.innerweb.novell.com/client/messenger/nim30linux.zip
+	md5sums = e332649760df984b166d39c427d2ae9f
+	depends_i686 = jre
 	depends_i686 = glib2
 	depends_i686 = libxext
 	depends_i686 = gtk2
-	depends_x86_64 = java32-runtime
+	depends_x86_64 = bin32-jre
 	depends_x86_64 = lib32-glib2
 	depends_x86_64 = lib32-libxext
 	depends_x86_64 = lib32-gtk2
diff --git a/PKGBUILD b/PKGBUILD
index f360637d6d61..2551f94bdd32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,32 @@
-# Maintainer: josephgbr <rafael.f.f1@gmail.com>
-
 pkgname=nmclient
-pkgver=2.2.2
-pkgrel=5
-pkgdesc="Novell Messenger client for linux"
+pkgver=3.0.2
+pkgrel=1
+pkgdesc="Novell Messenger Client for Linux"
 url="http://gwclient.provo.novell.com/"
 arch=('i686' 'x86_64')
 license=(custom)
+provides=('nmclient')
+conflictis=('nmclient2')
 install=$pkgname.install
 depends=('bash' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('unzip' 'rpmextract')
-depends_i686=('java-runtime' 'glib2' 'libxext' 'gtk2')
-depends_x86_64=('java32-runtime' 'lib32-glib2' 'lib32-libxext' 'lib32-gtk2')
-source=(https://gwclient.innerweb.novell.com/client/messenger/nvlmsgrlinuxrpm.zip)
-md5sums=('b10d0015e76edb50eb169193bc919a5a')
+depends_i686=('jre' 'glib2' 'libxext' 'gtk2')
+depends_x86_64=('bin32-jre' 'lib32-glib2' 'lib32-libxext' 'lib32-gtk2')
+source=(https://gwclient.innerweb.novell.com/client/messenger/nim30linux.zip)
+md5sums=('e332649760df984b166d39c427d2ae9f')
 
 build() {
     # just extract blob package
   rm -rf "$pkgname-$pkgver"
   mkdir "$pkgname-$pkgver"
   cd "$pkgname-$pkgver"
-  rpmextract.sh "$srcdir"/nvlmsgrlinux.rpm
+  rpmextract.sh "$srcdir"/novell-messenger-client-3.0.2-20151117.x86_64.rpm
   chmod +rx opt usr
 }
 
 package() {
   cd "$pkgname-$pkgver"
-
+ 
      # prepare directories  
   install -d "$pkgdir"/usr/bin \
          "$pkgdir"/usr/share/nmclient/ \
@@ -47,17 +47,20 @@ package() {
     JAVA_BIN=/usr/bin/java32
   fi
   
+    # set paths
+  sed -e "s#^CLIENT_PATH=.*#CLIENT_PATH=/usr/share/nmclient/#" \
+    -i "$pkgdir"/usr/bin/nmclient    
   sed -e "s#LD_LIBRARY_PATH=.*#LD_LIBRARY_PATH=\$JAVA_BIN:\$CLIENT_PATH \\\\#" \
-    -e "s#^JAVA_BIN=.*#JAVA_BIN=$JAVA_BIN#" \
-    -e "s#^CLIENT_PATH=.*#CLIENT_PATH=/usr/share/nmclient/#" \
-    -i "$pkgdir"/usr/bin/nmclient
+    -e "s#^JAVA_BIN=.*#JAVA_BIN=$JAVA_BIN#"                                    \
+    -e "s#^CLIENT_PATH=.*#CLIENT_PATH=/usr/share/nmclient/#"                   \
+    -i "$pkgdir"/usr/share/nmclient/launcher
   
     # set Icons and desktop file, and fix their paths
-  mv "$pkgdir"/usr/share/nmclient/nmclient.desktop \
+  mv "$pkgdir"/usr/share/nmclient/nmclient.desktop  \
        "$pkgdir"/usr/share/applications/
-  mv "$pkgdir"/usr/share/nmclient/nmclient.png \
+  mv "$pkgdir"/usr/share/nmclient/nmclient3.png     \
        "$pkgdir"/usr/share/icons/hicolor/48x48/apps/
   
-  sed -e 's/Exec=.*/Exec=nmclient/;s/Icon=.*/Icon=nmclient.png/' \
+  sed -e 's/Exec=.*/Exec=nmclient/;s/Icon=.*/Icon=nmclient3.png/' \
     -i "$pkgdir"/usr/share/applications/nmclient.desktop
 }