better handling of config files (via pacman) - should solve deinstallation problem; removed remaining call to nspluginwrapper; added makedepends as requested

2 files changed, 3 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c04d6535144b..b7ea2b63f40f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,22 @@
 # Contributor: Matthew Gyurgyik <matthew@pyther.net>
 pkgname=icaclient
 pkgver=13.2.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Citrix Receiver for x86_64 (64bit) Linux (ICAClient)"
 arch=('x86_64')
 url="http://www.citrix.com/English/ps2/products/product.asp?contentID=1689163&ntref=prod_top"
 license=('custom:Citrix')
 depends=('alsa-lib' 'libvorbis' 'curl' 'gtk2' 'libpng12' 'libxml2' 'libxaw' 'libxext' 'libxft'
   'libxinerama' 'libxmu' 'libxp' 'libxpm' 'libxt' 'ca-certificates')
+makedepends=('automake' 'autoconf' 'wget')
 optdepends=(
   'xerces-c: gtk2 configuration manager'
   'webkitgtk2: gtk2 selfservice/storefront ui')
 conflicts=('bin32-citrix-client' 'citrix-client')
 options=(!strip)
+backup=("opt/Citrix/ICAClient/config/appsrv.ini" "opt/Citrix/ICAClient/config/wfclient.ini" "opt/Citrix/ICAClient/config/module.ini")
 source_url="http:$(curl -L -silent 'http://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html' | awk -F 'rel=\"' '/linuxx64-/ {print $2}'| awk -F'"' '{print $1}'| sed '/^$/d' |uniq)"
 source=('configmgr.desktop'  'conncenter.desktop'  'selfservice.desktop' 'wfica.desktop' 'wfica.sh' 'wfica_assoc.sh' $pkgname-$pkgver.tar.gz::$source_url)
-makedepends=('wget')
 md5sums=('71aca6257f259996ac59729604f32978'
          'a38c3f844a0fefe8017a25bee213b843'
          '0e92c33b3fcc99b04269787da2984809'
diff --git a/citrix-client.install b/citrix-client.install
index 39aa48ae1649..bfb229ead565 100644
--- a/citrix-client.install
+++ b/citrix-client.install
@@ -1,31 +1,7 @@
-pre_install() {
-    tmpdir="/tmp"
-    instdir="/opt/Citrix/ICAClient"
-    configdir="${instdir}/config"
-
-    # If we already have citrix installed, we want to preserve the config files for the post_install question.
-    [ -e "${configdir}"/appsrv.ini ] && cp "${configdir}"/appsrv.ini ${tmpdir}/
-    [ -e "${configdir}"/wfclient.ini ] && cp "${configdir}"/wfclient.ini ${tmpdir}/
-    [ -e "${configdir}"/module.ini ] && cp "${configdir}"/module.ini ${tmpdir}/
-}
-
 post_install() {
     instdir="/opt/Citrix/ICAClient"
     tmpdir="/tmp"
-    nspluginwrapper -i /opt/Citrix/ICAClient/npica.so
-
 
-    echo "Should old the configuration files be taken into new build (y|N)?" 
-    read choice
-    choice="`echo ${choice} | tr '[:upper:]' '[:lower:]'`"
-    #restore config files
-    if [[ "${choice}" == "y" ]]; then 
-        echo "Copying old config files ..."
-        [ -e "${tmpdir}"/appsrv.ini ] && mv "${tmpdir}"/appsrv.ini "${instdir}"/config/ && echo "  Copied 'appsrv.ini'"
-        [ -e "${tmpdir}"/wfclient.ini ] && mv "${tmpdir}"/wfclient.ini "${instdir}"/config/ && echo "  Copied 'wfclient.ini'"
-        [ -e "${tmpdir}"/module.ini ] && mv "${tmpdir}"/module.ini "${instdir}"/config/ && echo "  Copied 'module.ini'"
-    fi
-    chmod 666 "${instdir}"/config/{appsrv,wfclient,module}.ini
     # symlink certificates
     [ -d /usr/share/ca-certificates/mozilla ] && ln -s /usr/share/ca-certificates/mozilla/* ${instdir}/keystore/cacerts/ > /dev/null 2>&1 
     echo "" 
@@ -35,12 +11,10 @@ post_install() {
     echo -e "\e[1;31m\nYou have to create '\e[1;33m\$HOME/.ICAClient/cache\e[1;31m' for each user who uses this program and then populate it with the appropriate ini files.  Copy paste the below to do this easily:\n"
     echo -e "\e[1;39mmkdir -p \$HOME/.ICAClient/cache"
     echo -e "cp ${instdir}/config/{All_Regions,Trusted_Region,Unknown_Region,canonicalization,regions}.ini \$HOME/.ICAClient/\n"
-    #echo -e "\e[1;37mFinally, set firefox to use the command '${firefox_command}' for .ICA files."
     echo -e "\e[0m"
 
     # add mimetype handler
     update-desktop-database -q
 }
 
-pre_upgrade()   { pre_install;  }  
 post_upgrade()  { post_install; }