Move to /opt and included license

In order to adopt a more KISS approach, all the code
moving the files from /opt to /usr directories were
remove.  As a consequence the PKGBUILD is much more
simpler and readable and there is not pratical
difference.

Also LICENSE file was obtained from documentation and
installed into the package, which is a requeriment
for software with custom licenses in Arch.

3 files changed, 53 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cf2af0fade8..cc6fe7a16b31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Dec 10 14:40:25 UTC 2017
 pkgbase = nmclient
 	pkgdesc = Novell Messenger Client for Linux
 	pkgver = 3.0.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gwclient.provo.novell.com/
 	arch = x86_64
 	license = custom
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1e32c14d2a7b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+# ignore everything ...
+*
+
+# ... except itself
+!.gitignore
+
+# ... except changes in package
+!PKGBUILD
+!.SRCINFO
+
+# ... except possible source files
+!*.patch
+!*.diff
+!*.desktop
+!*.png
+
+# ... except files from PKGBUILD fields
+!*.changelog
+!*.install
diff --git a/PKGBUILD b/PKGBUILD
index 3a99be1ffd6d..33eb2ac3a23e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,54 @@
 pkgname=nmclient
 pkgver=3.0.3
 _date=20160302
-pkgrel=1
+pkgrel=2
 pkgdesc="Novell Messenger Client for Linux"
 url="http://gwclient.provo.novell.com/"
 arch=('x86_64')
-license=(custom)
+license=(custom:proprietary)
 depends=('bin32-jre' 'lib32-glib2' 'lib32-libxext' 'lib32-gtk2'
          'bash' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('unzip')
-source=(https://gwclient.innerweb.novell.com/client/messenger/nim30linux.zip)
-sha256sums=('0defd9414ba96a66d407c34c6de88fc495f27ff028457afe95a64499e3f5504a')
+source=(https://gwclient.innerweb.novell.com/client/messenger/nim30linux.zip
+        LICENSE)
+sha256sums=('0defd9414ba96a66d407c34c6de88fc495f27ff028457afe95a64499e3f5504a'
+            'c7af4afb70c93eecfb851f799f7242c7b6798c196d455d50d992fa9f54d9f066')
 
-prepare() {
-  rm -rf "$pkgname-$pkgver"
+build() {
+  [ -d "$pkgname-$pkgver" ] && rm -rf "$pkgname-$pkgver"
   mkdir "$pkgname-$pkgver"
-}
 
-build() {
   cd "$pkgname-$pkgver"
+
+  rpmfile=novell-messenger-client-$pkgver-$_date.$arch.rpm
+  msg2 "Extracting $rpmfile..."
   
-  msg2 "Extracting RPM file..."
-    # exclude jre from extraction to save 109M
-  bsdtar -xf "$srcdir"/novell-messenger-client-$pkgver-$_date.x86_64.rpm \
-        --exclude=jre
+    # exclude jre from extraction to save 109 MB
+  bsdtar -xf "$srcdir"/$rpmfile --exclude=jre
   chmod +rx opt usr
 }
 
 package() {
   cd "$pkgname-$pkgver"
- 
-     # prepare directories  
-  install -d "$pkgdir"/usr/bin \
-         "$pkgdir"/usr/share/nmclient/ \
-         "$pkgdir"/usr/share/applications/ \
-         "$pkgdir"/usr/share/icons/hicolor/48x48/apps/
-  
-    # install data and doc files
-  cp -R opt/novell/messenger/client/* "$pkgdir"/usr/share/nmclient/
-  
-    # install  executable script, and fix java path and LD_LIBRARY_PATH
-  mv "$pkgdir"/usr/share/nmclient/run-messenger "$pkgdir"/usr/bin/nmclient
-  
+
+    # install everything, keeping files in /opt
+  install -dm755 "$pkgdir"/opt/novell/messenger/
+  cp -av opt/novell/messenger/client "$pkgdir"/opt/novell/messenger/
+
+    # make launcher script avaiable in PATH by installing in /usr/bin
+  install -dm755 "$pkgdir"/usr/bin
+  ln -s /opt/novell/messenger/client/run-messenger "$pkgdir"/usr/bin/nmclient
+
+    # install desktop file, remove redundant file
+  install -Dm644 {,"$pkgdir"/}usr/share/applications/nmclient.desktop
+  rm "$pkgdir"/opt/novell/messenger/client/nmclient.desktop
+
+    # set to use system's java32 instead of the expected internal JVM
   JAVA_BIN=/usr/bin/java32
-  
-    # 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/share/nmclient/launcher
-  
-    # set Icons and desktop file, and fix their paths
-  mv "$pkgdir"/usr/share/nmclient/nmclient.desktop  \
-       "$pkgdir"/usr/share/applications/
-  mv "$pkgdir"/usr/share/nmclient/nmclient3.png     \
-       "$pkgdir"/usr/share/icons/hicolor/48x48/apps/
-  
-  sed -e 's/Exec=.*/Exec=nmclient/;s/Icon=.*/Icon=nmclient3.png/' \
-    -i "$pkgdir"/usr/share/applications/nmclient.desktop
+  sed -e "s|LD_LIBRARY_PATH=|&\$JAVA_BIN|"    \
+      -e "s|^JAVA_BIN=.*|JAVA_BIN=$JAVA_BIN|" \
+      -i "$pkgdir"/opt/novell/messenger/client/launcher
+
+    # install license file
+  install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }