[arch-commits] Commit in gnomeicu/repos (3 files)
Jan de Groot
jgc at archlinux.org
Thu May 28 23:02:24 UTC 2009
Date: Thursday, May 28, 2009 @ 19:02:23
Author: jgc
Revision: 40233
Merged revisions 356,40231 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/gnomeicu/trunk
........
r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r40231 | jgc | 2009-05-29 01:00:48 +0200 (Fri, 29 May 2009) | 2 lines
upgpkg: gnomeicu 0.99.14-1
Update to current package standards
........
Modified:
gnomeicu/repos/extra-i686/ (properties)
gnomeicu/repos/extra-i686/PKGBUILD
gnomeicu/repos/extra-i686/gnomeicu.install
------------------+
PKGBUILD | 29 +++++++++++++----------------
gnomeicu.install | 23 ++---------------------
2 files changed, 15 insertions(+), 37 deletions(-)
Property changes on: gnomeicu/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /gnomeicu/trunk:1
+ /gnomeicu/trunk:1-40232
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-05-28 23:01:07 UTC (rev 40232)
+++ extra-i686/PKGBUILD 2009-05-28 23:02:23 UTC (rev 40233)
@@ -2,30 +2,27 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnomeicu
-pkgver=0.99.12
-pkgrel=3
+pkgver=0.99.14
+pkgrel=1
pkgdesc="A GNOME2 ICQ client."
arch=(i686 x86_64)
license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'libxss' 'scrollkeeper')
-makedepends=('pkgconfig')
+depends=('libgnomeui>=2.14.1' 'libxss')
+makedepends=('pkgconfig' 'gnome-doc-utils')
url="http://gnomeicu.sourceforge.net/"
+options=(!emptydirs)
install=gnomeicu.install
-source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('91d534e19a9f9e408f1f97b3b0748d20')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('f5afc147590543f607a6b4efa0c69052')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- if [ -f omf.make ]; then
- find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
- sed -i -e 's/-scrollkeeper-update.*//' omf.make
- fi
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var
+ --localstatedir=/var || return 1
make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
- 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
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnomeicu ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
Modified: extra-i686/gnomeicu.install
===================================================================
--- extra-i686/gnomeicu.install 2009-05-28 23:01:07 UTC (rev 40232)
+++ extra-i686/gnomeicu.install 2009-05-28 23:02:23 UTC (rev 40233)
@@ -1,9 +1,7 @@
pkgname=gnomeicu
post_install() {
- 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
- scrollkeeper-update -q -p var/lib/scrollkeeper
+ usr/sbin/gconfpkg --install ${pkgname}
}
pre_upgrade() {
@@ -15,22 +13,5 @@
}
pre_remove() {
- 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=`usr/bin/gconftool-2 --get-default-source`
-
- usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/sbin/gconfpkg --uninstall ${pkgname}
}
-
-post_remove() {
- scrollkeeper-update -q -p var/lib/scrollkeeper
-}
-op=$1
-shift
-
-$op $*
More information about the arch-commits
mailing list