Add zlib dependency and fix

4 files changed, 66 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6fa12d3d09c..8c0d5ccd367a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = warsaw-bin
 	pkgdesc = Banking security tool developed by GAS Tecnologia
 	pkgver = 1.12.13.8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.dieboldnixdorf.com.br/warsaw
+	install = warsaw-bin.install
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -20,9 +21,14 @@ pkgbase = warsaw-bin
 	depends = glib2
 	depends = libx11
 	depends = libstdc++296
+	depends = zlib
 	provides = warsaw
 	conflicts = warsaw
 	options = !strip
+	options = !emptydirs
+	backup = etc/init.d/warsaw
+	backup = etc/init/warsaw.conf
+	backup = etc/xdg/autostart/warsaw.desktop
 	source_i686 = https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_32.deb
 	sha256sums_i686 = f5be8314329edc47de71a377296b76d275255eb56f98a2e34eb32002ba0074cf
 	source_x86_64 = https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 9abfd68cd082..f7b95d8487fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,17 @@
 
 pkgname=warsaw-bin
 pkgver=1.12.13.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Banking security tool developed by GAS Tecnologia"
 arch=(i686 x86_64)
 url="http://www.dieboldnixdorf.com.br/warsaw"
 license=('custom')
-depends=('procps-ng' 'python2' 'python2-mini-amf' 'python2-unicodecsv' 'python-gpgme' 'python2-pyopenssl' 'openssl' 'nss' 'zenity' 'gdk-pixbuf2' 'pango' 'glib2' 'libx11' 'libstdc++296')
+depends=('procps-ng' 'python2' 'python2-mini-amf' 'python2-unicodecsv' 'python-gpgme' 'python2-pyopenssl' 'openssl' 'nss' 'zenity' 'gdk-pixbuf2' 'pango' 'glib2' 'libx11' 'libstdc++296' 'zlib')
+backup=('etc/init.d/warsaw' 'etc/init/warsaw.conf' 'etc/xdg/autostart/warsaw.desktop')
+options=('!strip' '!emptydirs')
+install=${pkgname}.install
 conflicts=('warsaw')
 provides=('warsaw')
-options=(!strip)
 source_i686=(https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_32.deb)
 source_x86_64=(https://cloud.gastecnologia.com.br/gas/diagnostico/warsaw_setup_64.deb)
 sha256sums_i686=('f5be8314329edc47de71a377296b76d275255eb56f98a2e34eb32002ba0074cf')
diff --git a/warsaw-bin.install b/warsaw-bin.install
new file mode 100644
index 000000000000..996cb3cc3b9e
--- /dev/null
+++ b/warsaw-bin.install
@@ -0,0 +1,54 @@
+post_install() {
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+	echo "To use Warsaw, start its service using:"
+	echo "$ sudo warsaw start"
+	echo "To start Warsaw at system startup, use the command:"
+	echo "$ sudo systemctl enable warsaw"
+
+	update-desktop-database -q
+}
+
+post_upgrade() {
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+	echo "To use Warsaw, start its service using:"
+	echo "$ sudo warsaw start"
+
+	    if command -v systemctl > /dev/null 2>&1; then
+	      systemctl restart warsaw.service
+	    fi
+
+	update-desktop-database -q
+}
+
+pre_remove() {
+
+	    if command -v systemctl > /dev/null 2>&1; then
+	      systemctl stop warsaw.service
+	    fi
+
+	    if command -v warsaw > /dev/null 2>&1; then
+	      warsaw stop
+	    fi
+
+	    if command -v systemctl > /dev/null 2>&1; then
+	      systemctl disable warsaw.service
+	      systemctl daemon-reload
+	    fi
+
+}
+
+post_remove() {
+	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+	    if command -v rm > /dev/null 2>&1; then
+	      rm -rf /usr/local/etc/warsaw
+	    fi
+
+	    if command -v pkill > /dev/null 2>&1; then
+	      pkill wsatspi
+	    fi
+
+	update-desktop-database -q
+}
diff --git a/warsaw.install b/warsaw.install
deleted file mode 100644
index 855015317c67..000000000000
--- a/warsaw.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-  echo "To use Warsaw, start its service using:"
-  echo "# systemctl enable warsaw"
-}
-
-pre_remove() {
-    systemctl disable warsaw
-    rm -rf /usr/local/etc/warsaw
-}