New version 1.6.0

3 files changed, 19 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2189fb9f1bbe..393167922bf0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eparakstitajs3
 	pkgdesc = Application software to sign and validate documents in EDOC and PDF formats.
-	pkgver = 1.5.19
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = https://www.eparaksts.lv
 	arch = x86_64
@@ -13,11 +13,11 @@ pkgbase = eparakstitajs3
 	optdepends = python-nautilus: Nautilus context menu integration
 	optdepends = eparaksts-token-signing: eParaksts browser plugins
 	optdepends = latvia-eid-middleware: libraries for Latvia eID cards
-	source = https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/eparakstitajs3/eparakstitajs3_1.5.19_amd64.deb
+	source = https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/eparakstitajs3/eparakstitajs3_1.6.0_amd64.deb
 	source = dpkg
 	source = eparakstitajs3.patch
-	sha512sums = e783f905dc4a5cd96f3f701cbb2f37660781c8db549d91dc31224f5aa9e2652b7bb43cfe7bb19a5925416638d7fdd5e065f2e489efb610b78339a305ba198ee2
+	sha512sums = 218c8b282644790f05ab4af58b351b32714388e3aeb3e48aba036869b430038f01a40190aaf085422dcc88a0a9faed72b2b873782331580876a6b1737cbc1c30
 	sha512sums = 2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a
-	sha512sums = 4b361882fd9701544afb7c68bb6aa3807cb9ecbe6026e76727e9c37ebe4dff69946f92bd55addb8bf8b0b7c30d846d2aeaad11b84391881378c7a20680fdc8ba
+	sha512sums = 7f7a8884c72b291c9e83bb84d9d3ce74cf27e953acab6833d7c9a21341e9fe6f29ffcfc9022ff60cc8ecf8b07c2240ba0dca48b4e8ac05a82594129a8abd7387
 
 pkgname = eparakstitajs3
diff --git a/PKGBUILD b/PKGBUILD
index 1f575b329ac4..62f74230df10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Māris Vilks <kaaposc@gmail.com>
 pkgname=eparakstitajs3
-pkgver=1.5.19
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Application software to sign and validate documents in EDOC and PDF formats."
 arch=('x86_64')
@@ -14,9 +14,9 @@ optdepends=('python-nautilus: Nautilus context menu integration'
 source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
         'dpkg'
         'eparakstitajs3.patch')
-sha512sums=('e783f905dc4a5cd96f3f701cbb2f37660781c8db549d91dc31224f5aa9e2652b7bb43cfe7bb19a5925416638d7fdd5e065f2e489efb610b78339a305ba198ee2'
+sha512sums=('218c8b282644790f05ab4af58b351b32714388e3aeb3e48aba036869b430038f01a40190aaf085422dcc88a0a9faed72b2b873782331580876a6b1737cbc1c30'
             '2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a'
-            '4b361882fd9701544afb7c68bb6aa3807cb9ecbe6026e76727e9c37ebe4dff69946f92bd55addb8bf8b0b7c30d846d2aeaad11b84391881378c7a20680fdc8ba')
+            '7f7a8884c72b291c9e83bb84d9d3ce74cf27e953acab6833d7c9a21341e9fe6f29ffcfc9022ff60cc8ecf8b07c2240ba0dca48b4e8ac05a82594129a8abd7387')
 
 package() {
 
diff --git a/eparakstitajs3.patch b/eparakstitajs3.patch
index d5aad56d2178..2b338242bf6b 100644
--- a/eparakstitajs3.patch
+++ b/eparakstitajs3.patch
@@ -1,53 +1,38 @@
-diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop src/eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop
---- src/eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop	2021-02-13 12:00:00.000000000 +0200
-+++ src/eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop	2021-02-14 17:48:58.580140002 +0200
+diff --color --unified --recursive --text --color ./eparakstitajs3.desktop.orig ./eparakstitajs3.desktop
+--- src/eparakstitajs3/usr/share/applications/eparakstitajs3.desktop.orig	2022-01-10 15:11:50.060249053 +0200
++++ src/eparakstitajs3/usr/share/applications/eparakstitajs3.desktop	2022-01-10 15:13:29.724741854 +0200
 @@ -4,7 +4,7 @@
  Icon=eparakstitajs3
  Type=Application
  Categories=Application;Office;Viewer;
--Exec=/opt/eparakstitajs3/eparakstitajs3 %F
-+Exec=/bin/sh -c "export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/eparakstitajs3 %F"
+-Exec=/opt/eparakstitajs3/bin/eparakstitajs3 %F
++Exec=/bin/sh -c "export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/bin/eparakstitajs3 %F"
  MimeType=application/pdf;application/lv.eme.edoc;application/vnd.etsi.asic-e+zip;
  StartupWMClass=lv.euso.signanywhere.SignAnywhere
  
-diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/menu/eparakstitajs3 src/eparakstitajs3.new/usr/share/menu/eparakstitajs3
---- src/eparakstitajs3.orig/usr/share/menu/eparakstitajs3	2021-02-13 12:00:00.000000000 +0200
-+++ src/eparakstitajs3.new/usr/share/menu/eparakstitajs3	2021-02-14 17:49:28.566161954 +0200
-@@ -1,5 +1,5 @@
- ?package(eparakstitajs3):needs="X11" section="Applications/Viewers"\

--  title="eParakstītājs 3.0" command="/opt/eparakstitajs3/eparakstitajs3"\

-+  title="eParakstītājs 3.0" command="/bin/sh -c \"export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/eparakstitajs3\""\

-   hints="eParakstītājs 3.0"\

-   kderemove="y"\

-   icon="/usr/share/icons/hicolor/32x32/apps/eparakstitajs3.png"

 diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py src/eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py
 --- src/eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-13 12:00:00.000000000 +0200
 +++ src/eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-14 16:13:33.916358188 +0200
-@@ -1,7 +1,10 @@
- from gi.repository import Nautilus, GObject
- import subprocess
+@@ -4,84 +4,93 @@
  import os
--import urllib
-+import urllib.request
-+import urllib.parse
-+import urllib.error
-+
+ import urllib
  
++
  class eParakstsContextMenu(GObject.GObject, Nautilus.MenuProvider):
  
-@@ -9,78 +12,86 @@
+     def __init__(self):
          pass
  
      def open_eparakstitajs(self, menu, command, files):
 -        print "menu_activate_cb", command
--	bash_string=["/opt/eparakstitajs3/eparakstitajs3", command]
+-	bash_string=["/opt/eparakstitajs3/bin/eparakstitajs3", command]
 -	for file in files:
 -		bash_string.append(file.get_location().get_path())
 -	
 -	subprocess.Popen(bash_string)
 -    
-+        print("menu_activate_cb", command)
-+        bash_string = ["/opt/eparakstitajs3/eparakstitajs3", command]
++        print("menu_activate_cb"), command
++        bash_string = ["/opt/eparakstitajs3/bin/eparakstitajs3", command]
 +        for file in files:
 +            bash_string.append(file.get_location().get_path())
 +