diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
| commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
| tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/vino | |
| parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
| parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'extra/vino')
| -rw-r--r-- | extra/vino/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/vino/vino.install | 15 |
2 files changed, 17 insertions, 17 deletions
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 366435c2f..cfbed0f8e 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 112935 2011-03-07 19:28:46Z ibiru $ +# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=2.32.1 +pkgver=3.0.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libnotify>=0.7.1' 'libxtst' 'libunique>=1.1.6' 'libsm' 'gconf>=2.32.0' 'libsoup>=2.32.1' 'telepathy-glib>=0.12.4' 'gtk2>=2.22.1' - 'libgnome-keyring>=2.32' 'avahi>=0.6.27') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') makedepends=('intltool' 'networkmanager') groups=('gnome-extra') url="http://www.gnome.org" options=(!emptydirs) install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8ec3cb84216323660d6301e02f5853f928789c20be68ded538dd849eafac4087') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,9 +24,9 @@ build() { --enable-gnome-keyring \ --enable-avahi 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 vino ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/vino/vino.install b/extra/vino/vino.install index 3bc7d3917..469266843 100644 --- a/extra/vino/vino.install +++ b/extra/vino/vino.install @@ -1,17 +1,18 @@ -pkgname=vino - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall vino + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_remove() { + post_install } |