[arch-commits] CVS update of extra/gnome/gnome-screensaver (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:19:07
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-screensaver

Modified: PKGBUILD (1.11 -> 1.12) gnome-screensaver.install (1.2 -> 1.3)

upgpkg: gnome-screensaver 2.18.1-1
Move to /usr


---------------------------+
 PKGBUILD                  |   46 ++++++++++++++++++++++----------------------
 gnome-screensaver.install |   17 ++++++----------
 2 files changed, 30 insertions(+), 33 deletions(-)


Index: extra/gnome/gnome-screensaver/PKGBUILD
diff -u extra/gnome/gnome-screensaver/PKGBUILD:1.11 extra/gnome/gnome-screensaver/PKGBUILD:1.12
--- extra/gnome/gnome-screensaver/PKGBUILD:1.11	Fri Mar 23 13:48:18 2007
+++ extra/gnome/gnome-screensaver/PKGBUILD	Sun Apr 22 12:19:07 2007
@@ -1,40 +1,40 @@
-# $Id: PKGBUILD,v 1.11 2007/03/23 17:48:18 jgc Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
-# Contributer: Mark Rosenstand <mark at archlinux.org>
+# $Id: PKGBUILD,v 1.12 2007/04/22 16:19:07 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
 pkgname=gnome-screensaver
-pkgver=2.18.0
+pkgver=2.18.1
 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.18.0' 'libxmu' 'libxxf86misc' 'libexif>=0.6.13'
-	 'libgnomekbd>=2.18.0' 'libxss' 'libxpm' 'mesa')
-makedepends=('pkgconfig' 'gettext' 'perlxml' 'xscreensaver')
+depends=('gnome-menus>=2.18.0-2' 'libxxf86misc' 'libexif>=0.6.13'
+	 'libgnomekbd>=2.18.1-2' 'libxss' 'libgl')
+makedepends=('pkgconfig' 'gettext' 'perlxml' 'mesa' 'xscreensaver')
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
         archify-pam.patch)
-md5sums=('c123d954b215d970dad117b15ca46cd7' '18c417676f6e8ef16ca2a10be74578a5')
+md5sums=('6075ae44be7841090b9acfed5c511405' '18c417676f6e8ef16ca2a10be74578a5')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np0 -i ${startdir}/src/archify-pam.patch || return 1
-  ./configure --prefix=/opt/gnome \
-	--with-pam-prefix=/etc \
-	--with-dpms-ext \
-	--with-gdm_config=/opt/gnome/share/gdm/defaults.conf
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gnome-screensaver \
+              --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
+	      --with-xscreensaverdir=/usr/share/xscreensaver/config \
+	      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
+	      --with-dpms-ext
   make || return 1
   make DESTDIR=${startdir}/pkg install
+
+  #Migrate xscreensaver configuration files
+  sed -i -e 's|TryExec=|TryExec=/usr/lib/xscreensaver/|' data/xscreensaver-config.xsl
+  cd ${startdir}/pkg/usr/share/applications/screensavers
+  ${startdir}/src/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
   
-  # let's install all of xscreensaver's screensavers  
-  install -m755 /usr/libexec/xscreensaver/* ${startdir}/pkg/opt/gnome/libexec/gnome-screensaver
-  migratescript="${startdir}/src/gnome-screensaver-${pkgver}/data/migrate-xscreensaver-config.sh"
-  cd ${startdir}/pkg/opt/gnome/share/applications/screensavers
-  for i in /usr/share/xscreensaver/config/*; do 
-     ${migratescript} ${i}  
-  done
-  
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gnome-screensaver/gnome-screensaver.install
diff -u extra/gnome/gnome-screensaver/gnome-screensaver.install:1.2 extra/gnome/gnome-screensaver/gnome-screensaver.install:1.3
--- extra/gnome/gnome-screensaver/gnome-screensaver.install:1.2	Thu Jun 22 18:15:47 2006
+++ extra/gnome/gnome-screensaver/gnome-screensaver.install	Sun Apr 22 12:19:07 2007
@@ -1,9 +1,8 @@
 pkgname=gnome-screensaver
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  update-desktop-database -q
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 }
 
 pre_upgrade() {
@@ -15,18 +14,16 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1