Sun May 1 22:33:26 UTC 2011

2 files changed, 17 insertions, 40 deletions

diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD
index 703142f16..6b66e6e7e 100644
--- a/extra/gnome-screensaver/PKGBUILD
+++ b/extra/gnome-screensaver/PKGBUILD
@@ -1,50 +1,37 @@
-# $Id: PKGBUILD 112853 2011-03-07 09:08:52Z ibiru $
+# $Id: PKGBUILD 117764 2011-04-04 17:44:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.30.2
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.30.4' 'libgnomekbd>=2.32.0' 'libgl' 'libnotify>=0.7.1' 'gnome-desktop>=2.32.0')
-makedepends=('pkgconfig' 'intltool' 'mesa' 'xscreensaver' 'libxss' 'libxslt')
+depends=('dbus-glib' 'gnome-menus' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas')
+makedepends=('pkgconfig' 'intltool' 'libxss')
 optdepends=('xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-	      gnome-screensaver.pam
-              gnome-screensaver-2.30.2-libnotify-0.7.patch)
-sha256sums=('dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa'
-            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2'
-            'fd79843008fb93d6caa5f84dd4766c99895ce520517b17a2a334da8c869041bb')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+       gnome-screensaver.pam)
+sha256sums=('e00e801d94c1d9f1e62049f77b91d822047eb1dcbd2e01cc38b5dd1b0f67c948'
+            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-screensaver-2.30.2-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-screensaver \
       --localstatedir=/var \
-      --with-xscreensaverdir=/usr/share/xscreensaver/config \
-      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
       --with-mit-ext
 
   make
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
-
-  #Migrate xscreensaver configuration files
-  sed -e 's|Exec=|Exec=/usr/lib/xscreensaver/|' \
-      -i data/xscreensaver-config.xsl
-  cd "${pkgdir}/usr/share/applications/screensavers"
-  "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" \
-      /usr/share/xscreensaver/config/*.xml
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-screensaver ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
 }
diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/extra/gnome-screensaver/gnome-screensaver.install
index d79cf1a1e..3b0e06046 100644
--- a/extra/gnome-screensaver/gnome-screensaver.install
+++ b/extra/gnome-screensaver/gnome-screensaver.install
@@ -1,17 +1,7 @@
 pkgname=gnome-screensaver
 
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
 pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
 }