[arch-commits] Commit in gossip/trunk (PKGBUILD gossip.install)

[Allan McRae]

    Date: Saturday, February 20, 2010 @ 05:31:26
  Author: allan
Revision: 69324

upgpkg: gossip 0.28-3
rebuild to remove .FILELIST, tidy up PKGBUILD

Modified:
  gossip/trunk/PKGBUILD
  gossip/trunk/gossip.install

----------------+
 PKGBUILD       |   18 +++++++++---------
 gossip.install |    9 ---------
 2 files changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-20 10:29:45 UTC (rev 69323)
+++ PKGBUILD	2010-02-20 10:31:26 UTC (rev 69324)
@@ -4,7 +4,7 @@
 
 pkgname=gossip
 pkgver=0.28
-pkgrel=2
+pkgrel=3
 pkgdesc="A GNOME Jabber client"
 arch=('i686' 'x86_64')
 url="http://www.imendio.com/projects/gossip/"
@@ -20,7 +20,7 @@
          '7ed8dc152e4bb36bdb73e7e8e56b22b9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   export CFLAGS="${CFLAGS} -DLM_NO_DEBUG"
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -33,13 +33,13 @@
               --enable-aspell=yes
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-       DESTDIR=${startdir}/pkg install
+       DESTDIR=${pkgdir} install
 
-  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 -dm755 ${pkgdir}/usr/share/gconf/schemas  
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas \
+    ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 
-  install -Dm644 ${startdir}/src/org.gnome.Gossip.service \
-    ${startdir}/pkg/usr/share/dbus-1/services/org.gnome.Gossip.service
+  install -Dm644 ${srcdir}/org.gnome.Gossip.service \
+    ${pkgdir}/usr/share/dbus-1/services/org.gnome.Gossip.service
 }

Modified: gossip.install
===================================================================
--- gossip.install	2010-02-20 10:29:45 UTC (rev 69323)
+++ gossip.install	2010-02-20 10:31:26 UTC (rev 69324)
@@ -6,10 +6,6 @@
 }
 
 pre_upgrade() {
-  echo ">> Gossip 0.28 has a new backwards-incompatible format of account data."
-  echo ">> You will have to re-create your account(s) on first startup."
-  echo ">> You can see your account data in ~/.gnome2/Gossip/accounts.xml file."
-  echo ">> Write them down somewhere before re-creating your account(s)."
   pre_remove $1
 }
 
@@ -24,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*