Version bump 4.6.0

5 files changed, 16 insertions, 122 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85e15c8b96cb..0f89728e25bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = nemo-dropbox
 	pkgdesc = Dropbox for Linux - Nemo extension
-	pkgver = 4.4.0
+	pkgver = 4.6.0
 	pkgrel = 1
 	url = https://github.com/linuxmint/nemo-extensions
 	arch = x86_64
+	arch = i686
+	arch = armv7h
+	arch = aarch64
 	groups = nemo-extensions
 	license = custom:CC-BY-ND-3
 	license = GPL
-	makedepends = glib2
-	makedepends = python-docutils
-	makedepends = python-gobject
-	depends = nemo>=4.4
+	depends = nemo
 	depends = dropbox
 	depends = polkit
-	source = nemo-extensions-4.4.0.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/4.4.0.tar.gz
-	source = 01__Remove-python-dependencies.patch
-	source = 02__Makefile.patch
-	md5sums = fef59443ae265b5f551e365c47c7db9f
-	md5sums = 4e607465244108d0eae5422ed04a7ac1
-	md5sums = fb0f04ed594b62bc9bf7256d18a4d6c2
+	source = nemo-extensions-4.6.0.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/4.6.0.tar.gz
+	sha256sums = f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd
 
 pkgname = nemo-dropbox
 
diff --git a/01__Remove-python-dependencies.patch b/01__Remove-python-dependencies.patch
deleted file mode 100644
index c93846d987c6..000000000000
--- a/01__Remove-python-dependencies.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur ./nemo-dropbox/configure.ac ./nemo-dropbox/configure.ac
---- ./nemo-dropbox/configure.ac	2017-08-25 13:02:43.639767896 -0400
-+++ ./nemo-dropbox/configure.ac	2017-08-25 13:05:51.487464850 -0400
-@@ -29,36 +29,6 @@
- PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-
--AC_PATH_PROG([PYTHON], [python])
--
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
--AC_SUBST(RST2MAN)
--
--# define module checking macro
--AC_DEFUN([PYTHON_CHECK_MODULE], [
--AC_MSG_CHECKING([for $1])
--
--cat <<EOF | python
--try:
-- import $2
--except:
-- exit(1)
--else:
-- exit(0)
--EOF
--
--if test $? -ne 0; then
--   AC_MSG_RESULT([no])
--   AC_MSG_ERROR([couldn't find $1])
--else
--   AC_MSG_RESULT([yes])
--fi
--])
--
--PYTHON_CHECK_MODULE(pygtk, gtk)
--PYTHON_CHECK_MODULE(gobject, gobject)
--PYTHON_CHECK_MODULE(docutils, docutils)
--
- # Make dependency CFLAGS and LIBS available
- AC_SUBST(NEMO_CFLAGS)
- AC_SUBST(NEMO_LIBS)
-diff -Naur ./nemo-dropbox/data/Makefile.am ./nemo-dropbox/data/Makefile.am
---- ./nemo-dropbox/data/Makefile.am	2017-08-25 13:02:43.639767896 -0400
-+++ ./nemo-dropbox/data/Makefile.am	2017-08-25 13:04:11.388692078 -0400
-@@ -1,6 +1 @@
--applicationdir = $(datadir)/applications
--application_DATA = dropbox.desktop
--
--EXTRA_DIST = $(application_DATA)
--
--SUBDIRS = icons emblems
-+SUBDIRS = emblems
diff --git a/02__Makefile.patch b/02__Makefile.patch
deleted file mode 100644
index b2fde789a1cc..000000000000
--- a/02__Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./nemo-dropbox/Makefile.am	2017-11-20 15:23:34.468423472 +0100
-+++ ./nemo-dropbox/Makefile.am	2017-11-20 15:25:11.966937763 +0100
-@@ -1,16 +1,2 @@
- AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
--
--bin_SCRIPTS = dropbox
--CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt
--EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py
--man_MANS = dropbox.1
--
--dropbox: dropbox.in serializeimages.py
--	python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
--	chmod +x dropbox
--
--dropbox.1: dropbox dropbox.txt.in docgen.py
--	python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
--	$(RST2MAN) dropbox.txt > dropbox.1
--
- SUBDIRS = data src
diff --git a/PKGBUILD b/PKGBUILD
index 737ad5e1ffb6..15661f69d431 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,22 @@
-# Maintainer: Sebastian Lau <lauseb644 _at_ gmail.com>
-# Contributor: twa022 <twa022 at gmail dot com>
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: Sebastian Lau <lauseb644 _at_ gmail.com>
 # Contributor: American_Jesus <american.jesus.pt AT gmail DOT com>
 
 pkgname=nemo-dropbox
-pkgver=4.4.0
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="Dropbox for Linux - Nemo extension"
-arch=('x86_64')
+arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url="https://github.com/linuxmint/nemo-extensions"
 license=('custom:CC-BY-ND-3' 'GPL')
-depends=('nemo>=4.4' 'dropbox' 'polkit')
-makedepends=('glib2' 'python-docutils' 'python-gobject')
+depends=('nemo' 'dropbox' 'polkit')
 groups=('nemo-extensions')
-source=("nemo-extensions-$pkgver.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/$pkgver.tar.gz"
-	"01__Remove-python-dependencies.patch"
-        "02__Makefile.patch")
-md5sums=('fef59443ae265b5f551e365c47c7db9f'
-         '4e607465244108d0eae5422ed04a7ac1'
-         'fb0f04ed594b62bc9bf7256d18a4d6c2')
+source=("nemo-extensions-$pkgver.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/$pkgver.tar.gz")
+sha256sums=('f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd')
 
 prepare() {
-  cd "${srcdir}/nemo-extensions-${pkgver}/"
-
-  patch -uNp1 < $srcdir/01__Remove-python-dependencies.patch
-  patch -uNp1 < $srcdir/02__Makefile.patch
-
-  cd "${pkgname}"
-  autoreconf -fi
+  cd "${srcdir}/nemo-extensions-${pkgver}/${pkgname}"
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -42,10 +32,4 @@ package() {
 
   # install the common license
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
-  cd "${srcdir}/nemo-extensions-${pkgver}/${pkgname}/data/emblems/"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/nemo-extensions-${pkgver}/${pkgname}/data/icons/"
-  make DESTDIR="${pkgdir}" install
 }
diff --git a/nemo-dropbox.install b/nemo-dropbox.install
deleted file mode 100644
index 9654f5b34f69..000000000000
--- a/nemo-dropbox.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  cat <<-EndOfMessage
-
-==> Restart nemo with 'nemo -q'
-
-EndOfMessage
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-