summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Landauer2016-06-16 17:23:28 +0200
committerBernhard Landauer2016-06-16 17:23:28 +0200
commit0a2a9a1194cbb8cc05d04f1ce186ddf0a0c881f3 (patch)
tree52a69cf250be05ec95791e0833f52b7174b2128e
parentf3fa0f83c70145936ae8c062698f52c7bfad7f08 (diff)
downloadaur-0a2a9a1194cbb8cc05d04f1ce186ddf0a0c881f3.tar.gz
upd python, adjust desktop file
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0bdd3d745d20..1d4503940ae5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Jun 16 14:11:48 UTC 2016
+# Thu Jun 16 14:52:54 UTC 2016
pkgbase = nemo-git
pkgdesc = Cinnamon file manager, git-version
pkgver = 3.0.5.r4.g8d897c6
@@ -14,8 +14,9 @@ pkgbase = nemo-git
makedepends = gobject-introspection
makedepends = gtk-doc
makedepends = intltool
+ makedepends = python-gobject
makedepends = python2-gobject
- makedepends = python2-polib
+ makedepends = python-polib
depends = cinnamon-desktop
depends = cinnamon-translations
depends = dconf
@@ -25,7 +26,7 @@ pkgbase = nemo-git
depends = libexif
depends = libnotify
depends = libxml2
- depends = python2
+ depends = python
provides = nemo
conflicts = nemo
options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index c247a4f4cc32..62317629558b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,14 +19,15 @@ depends=('cinnamon-desktop'
'libexif'
'libnotify'
'libxml2'
- 'python2')
+ 'python')
makedepends=('git'
'gnome-common'
'gobject-introspection'
'gtk-doc'
'intltool'
+ 'python-gobject'
'python2-gobject'
- 'python2-polib')
+ 'python-polib')
conflicts=('nemo')
provides=('nemo')
options=('!emptydirs')
@@ -42,8 +43,8 @@ pkgver() {
prepare() {
cd $srcdir/nemo
- # Python2 fix
- find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+ # Rename 'Files' app name to avoid having the same as nautilus
+ sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
}
build() {