Fri Feb 8 00:08:16 PST 2013

2 files changed, 27 insertions, 33 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 09aa49021..ab7686196 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,30 +1,37 @@
-# $Id: PKGBUILD 83413 2013-01-31 17:33:38Z bpiotrowski $
+# $Id: PKGBUILD 83983 2013-02-07 22:10:55Z bgyorgy $
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
 
 pkgname=cinnamon
 pkgver=1.6.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('caribou' 'gjs' 'gnome-bluetooth' 'gnome-control-center' 'gnome-panel' 'gnome-session'
-         'gnome-settings-daemon' 'gnome-themes-standard' 'gstreamer0.10' 'libgnomekbd' 'muffin'
-         'notification-daemon' 'python2-gconf' 'python2-imaging' 'python2-lxml' 'python2-dbus' 'gksu')
+depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
+         'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
+         'gstreamer0.10' 'libgnomekbd' 'networkmanager' 'muffin' 'python2-dbus'
+         'python2-gconf' 'python2-imaging' 'python2-lxml')
 makedepends=('gnome-common' 'intltool')
-optdepends=('nautilus: the official Gnome file manager')
+optdepends=('gnome-control-center: open settings from various applets'
+            'gnome-screensaver: lock screen'
+            'nautilus: the official Gnome file manager')
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
-source=("$pkgname.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "cinnamon-screensaver.desktop"
         "cinnamon2d-screensaver.desktop"
-        "fix-cursor-change.patch"
         "gnome-autogen.sh")
+md5sums=('ea73c6367d43d82c61f977477bf0c08c'
+         'd55c079cdc8bec606f510f87b2a6f776'
+         '5c6af851ab1cf7e9219f11d86353196a'
+         'a925691c9b57a6a884dcf07da057fd1f')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
-  patch -Np1 -i ${srcdir}/fix-cursor-change.patch
-
   cp ${srcdir}/gnome-autogen.sh .
   sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
   sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
@@ -48,7 +55,6 @@ package() {
   
   # Python2 fix
   sed -i 's/bin\/python/bin\/python2/g' \
-    "${pkgdir}/usr/bin/$pkgname-extension-tool" \
     "${pkgdir}/usr/bin/$pkgname-launcher" \
     "${pkgdir}/usr/bin/$pkgname-menu-editor" \
     "${pkgdir}/usr/bin/$pkgname-settings" \
@@ -62,8 +68,4 @@ package() {
   cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart
 }
 
-md5sums=('ea73c6367d43d82c61f977477bf0c08c'
-         'd55c079cdc8bec606f510f87b2a6f776'
-         '5c6af851ab1cf7e9219f11d86353196a'
-         '8d7a93a1eb0f1d44e4869abd342ed22a'
-         'a925691c9b57a6a884dcf07da057fd1f')
+
diff --git a/community/cinnamon/cinnamon.install b/community/cinnamon/cinnamon.install
index 0f1197226..901fd95c9 100644
--- a/community/cinnamon/cinnamon.install
+++ b/community/cinnamon/cinnamon.install
@@ -1,19 +1,19 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
-  
-  if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then
-
-    if [[ $(uname -m) == 'i686' ]];then
-    	ln -s /usr/lib/libgnome-desktop-3.so /usr/lib/libgnome-desktop-3.so.2
-    fi
-
-  fi
 }
 
 pre_upgrade() {
   if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then
     gconfpkg --uninstall cinnamon
   fi
+
+  if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then
+    if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then
+      if [[ $(uname -m) == 'i686' ]]; then
+        unlink /usr/lib/libgnome-desktop-3.so.2
+      fi
+    fi
+  fi
 }
 
 post_upgrade() {
@@ -25,13 +25,5 @@ pre_remove() {
 }
 
 post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-
-  if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then
-
-    if [[ $(uname -m) == 'i686' ]];then
-    	unlink /usr/lib/libgnome-desktop-3.so.2
-    fi
-
-  fi
+  post_install
 }