upgpkg: onionshare 1.3-2

Fix nautilus patch

3 files changed, 14 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e64e04f40da5..7ff29fbcad35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb 27 17:54:39 UTC 2018
+# Wed Feb 28 09:19:26 UTC 2018
 pkgbase = onionshare
 	pkgdesc = Lets you securely and anonymously share a file of any size with someone
 	pkgver = 1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/micahflee/onionshare
 	arch = any
 	license = GPL3
@@ -17,7 +17,7 @@ pkgbase = onionshare
 	source = https://github.com/micahflee/onionshare/archive/v1.3.tar.gz
 	source = nautilus-python.patch
 	sha512sums = 910928cf6e3672a8e59e452da1c5297b18f98854dbde836c02ef3458c33339f77cf16a0c5f2559ff364801a0e5ca2091bbb242aea8f6eaf00b0e8cbb6f261956
-	sha512sums = 6cc3b3d178bea9cd9fecaf735e82ad7ff7161ad4396086881d7e45a9a70bd55c1074ec65c6359a64417a42493f305caf7ba89e1c40c9a9def03dd1d11cb7efb7
+	sha512sums = d884248099f22ba72e99d40bce49d262ef2a481cc29af1d8b726c5d39eba2f6f21987317d44fea1eb46f136249da008523e6e6ae7d3f6be551966d5bfdd72552
 
 pkgname = onionshare
 
diff --git a/PKGBUILD b/PKGBUILD
index a2890bdf349e..3e9ab8a61615 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Simon Hanna <thelinuxguy on freenode>
 pkgname=onionshare
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Lets you securely and anonymously share a file of any size with someone"
 url="https://github.com/micahflee/onionshare"
 arch=('any')
@@ -19,7 +19,7 @@ source=(
     nautilus-python.patch
     )
 sha512sums=('910928cf6e3672a8e59e452da1c5297b18f98854dbde836c02ef3458c33339f77cf16a0c5f2559ff364801a0e5ca2091bbb242aea8f6eaf00b0e8cbb6f261956'
-            '6cc3b3d178bea9cd9fecaf735e82ad7ff7161ad4396086881d7e45a9a70bd55c1074ec65c6359a64417a42493f305caf7ba89e1c40c9a9def03dd1d11cb7efb7')
+            'd884248099f22ba72e99d40bce49d262ef2a481cc29af1d8b726c5d39eba2f6f21987317d44fea1eb46f136249da008523e6e6ae7d3f6be551966d5bfdd72552')
 
 
 prepare() {
diff --git a/nautilus-python.patch b/nautilus-python.patch
index d22fa78878f4..f1a3601d166b 100644
--- a/nautilus-python.patch
+++ b/nautilus-python.patch
@@ -1,10 +1,12 @@
-diff -ura onionshare-1.2.orig/setup.py onionshare-1.2.new/setup.py
---- onionshare-1.2.orig/setup.py	2018-02-08 16:08:34.170828571 +0100
-+++ onionshare-1.2.new/setup.py	2018-02-08 16:08:57.864345962 +0100
-@@ -62,6 +62,5 @@
-         (os.path.join(sys.prefix, 'share/onionshare/images'), file_list('share/images')),
+diff -ura onionshare-1.3.orig/setup.py onionshare-1.3/setup.py
+--- onionshare-1.3.orig/setup.py	2018-02-26 19:06:54.000000000 +0100
++++ onionshare-1.3/setup.py	2018-02-28 10:17:12.114032300 +0100
+@@ -54,8 +54,6 @@
          (os.path.join(sys.prefix, 'share/onionshare/locale'), file_list('share/locale')),
          (os.path.join(sys.prefix, 'share/onionshare/html'), file_list('share/html')),
--        ('/usr/share/nautilus-python/extensions/', ['install/scripts/onionshare-nautilus.py'])
      ]
- )
+-if platform.system() != 'OpenBSD':
+-    data_files.append(('/usr/share/nautilus-python/extensions/', ['install/scripts/onionshare-nautilus.py']))
+ 
+ setup(
+     name='onionshare', version=version,