Remove rpmextract dependency

2 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dfcfcfd8abd..f8dece7bd859 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jul  8 16:04:20 UTC 2016
+# Wed Nov 23 03:21:39 UTC 2016
 pkgbase = nmclient2
 	pkgdesc = Novell Messenger client for linux (version 2)
 	pkgver = 2.2.2
@@ -8,8 +8,6 @@ pkgbase = nmclient2
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = unzip
-	makedepends = rpmextract
 	provides = nmclient
 	conflicts = nmclient
 	source = https://nm-pers.hj.se:8300/~down/client/xplat/linux/nvlmsgr.bin
diff --git a/PKGBUILD b/PKGBUILD
index fbb7afb89fad..4f4dfc6f5403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: rafaelff <rafaelff@gnome.org>
+# Maintainer: Rafael Fontenelle <rafaelff@gnome.org>
 
 pkgname=nmclient2
 pkgver=2.2.2
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64')
 license=(custom)
 provides=("nmclient")
 conflicts=("nmclient")
-makedepends=('unzip' 'rpmextract')
 depends_i686=('java-runtime' 'gtk2' 'libxss' 'libpng12' 'glitz')
 depends_x86_64=('java32-runtime'  'lib32-gtk2' 'lib32-libxss' 'lib32-libpng12' 'lib32-glitz')
 source=("https://nm-pers.hj.se:8300/~down/client/xplat/linux/nvlmsgr.bin")
@@ -17,20 +16,19 @@ source=("https://nm-pers.hj.se:8300/~down/client/xplat/linux/nvlmsgr.bin")
 md5sums=('d2f94e16858f1f06385ade028557e810')
 
 prepare() {
-   msg2 "patching the source file..."
+   msg2 "Patching the source file..."
    sed -e "s/^TMP_DIR=.*/TMP_DIR=$pkgname-$pkgver/" -i nvlmsgr.bin
 }
 
 build() {
   rm -rf "$pkgname-$pkgver"
   
-    # obtain rpmfile, although it can't find rpm executable - no problem here
-  msg2 "obtaining RPM file from BIN file..."
+  msg2 "Obtaining RPM file from BIN file (ignore RPM error message below)..."
   fakeroot sh ./nvlmsgr.bin 2> /dev/null || true
-    # just extract rpm package
-  msg2 "extracting RPM file..."
+
+  msg2 "Extracting RPM file..."
   cd "$pkgname-$pkgver"
-  rpmextract.sh nmclient/novell-messenger-client-2.2.2-20150416.i586.rpm
+  bsdtar -xf nmclient/novell-messenger-client-2.2.2-20150416.i586.rpm
   chmod +rx opt usr
 }
 
@@ -38,9 +36,9 @@ package() {
   cd "$pkgname-$pkgver"
 
      # prepare directories  
-  install -d "$pkgdir"/usr/bin \
-         "$pkgdir"/usr/share/nmclient/ \
-         "$pkgdir"/usr/share/applications/ \
+  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, excluding embedded JRE
@@ -57,10 +55,10 @@ package() {
     JAVA_BIN=/usr/bin/java32
   fi
   
-  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
+  sed -i "$pkgdir"/usr/bin/nmclient                                          \
+    -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/#"
   
     # set Icons and desktop file, and fix their paths
   mv "$pkgdir"/usr/share/nmclient/nmclient.desktop \
@@ -68,6 +66,6 @@ package() {
   mv "$pkgdir"/usr/share/nmclient/nmclient.png \
        "$pkgdir"/usr/share/icons/hicolor/48x48/apps/
   
-  sed -e 's/Exec=.*/Exec=nmclient/;s/Icon=.*/Icon=nmclient.png/' \
-    -i "$pkgdir"/usr/share/applications/nmclient.desktop
+  sed -i "$pkgdir"/usr/share/applications/nmclient.desktop  \
+    -e 's/Exec=.*/Exec=nmclient/;s/Icon=.*/Icon=nmclient.png/'
 }