Date: Wednesday, February 16, 2011 @ 13:47:44
Author: heftig
Revision: 110147
upgpkg: nautilus 2.91.8-1
Update for gnome-unstable
Modified:
nautilus/trunk/PKGBUILD
nautilus/trunk/nautilus.install
Deleted:
nautilus/trunk/nautilus-condrestart.patch
----------------------------+
PKGBUILD | 20 +++++++++-----------
nautilus-condrestart.patch | 16 ----------------
nautilus.install | 18 ++++++------------
3 files changed, 15 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-16 18:23:11 UTC (rev 110146)
+++ PKGBUILD 2011-02-16 18:47:44 UTC (rev 110147)
@@ -2,35 +2,33 @@
# Maintainer: Jan de Groot <j...@archlinux.org>
pkgname=nautilus
-pkgver=2.32.2.1
+pkgver=2.91.8
pkgrel=1
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libexif>=0.6.19' 'gnome-desktop>=2.32.1' 'exempi>=2.1.1'
'libunique>=1.1.6' 'hicolor-icon-theme' 'gvfs>=1.6.6' 'desktop-file-utils')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs'
+ 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info')
makedepends=('intltool' 'gobject-introspection' 'namcap')
replaces=('gnome-volume-manager')
url="http://www.gnome.org";
groups=('gnome')
options=('!libtool' '!emptydirs')
install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
- nautilus-condrestart.patch)
-sha256sums=('802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303'
- 'f825292ef26274d3044272ca9f25095391cc49d30fb0056e7ed7346a1b4d106c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('197ca86fdb5d7d87e732ec77ac6d0e862d0cf1924034adcedc93dab88293f44d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/nautilus-condrestart.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nautilus \
--disable-update-mimedb \
--disable-packagekit
make
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain nautilus ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
Deleted: nautilus-condrestart.patch
===================================================================
--- nautilus-condrestart.patch 2011-02-16 18:23:11 UTC (rev 110146)
+++ nautilus-condrestart.patch 2011-02-16 18:47:44 UTC (rev 110147)
@@ -1,16 +0,0 @@
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.condrestart
nautilus-2.25.93/nautilus.desktop.in
---- nautilus-2.25.93/data/nautilus.desktop.in.condrestart 2009-03-12
10:49:41.449753624 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in 2009-03-12 10:49:51.814754208
-0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart
nautilus-2.25.93/nautilus.desktop.in.in
---- nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart 2009-03-12
10:47:41.681753834 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in.in 2009-03-12
10:49:29.663754303 -0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
Modified: nautilus.install
===================================================================
--- nautilus.install 2011-02-16 18:23:11 UTC (rev 110146)
+++ nautilus.install 2011-02-16 18:47:44 UTC (rev 110147)
@@ -1,26 +1,20 @@
-pkgname=nautilus
-
post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
update-mime-database usr/share/mime > /dev/null
}
pre_upgrade() {
- pre_remove $1
+ if (( $(vercmp $2 2.90.0) < 0 )); then
+ usr/sbin/gconfpkg --uninstall nautilus
+ fi
}
post_upgrade() {
- post_install $1
+ post_install
}
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
+ post_install
}
