[arch-commits] CVS update of extra/gnome/gnome-common (6 files)
Jan de Groot
jgc at archlinux.org
Sat Sep 22 12:47:35 UTC 2007
Date: Saturday, September 22, 2007 @ 08:47:35
Author: jgc
Path: /home/cvs-extra/extra/gnome/gnome-common
Modified: PKGBUILD (1.32 -> 1.33)
Removed: automake1.10-support.diff (1.1) gnome-common.install (1.7)
gnome-common.pth (1.2) gnome-dbus.conf (1.2) gnome.profile (1.11)
upgpkg: gnome-common 2.20.0-1
GNOME 2.20, cleanup old unused files
---------------------------+
PKGBUILD | 10 +++++-----
automake1.10-support.diff | 21 ---------------------
gnome-common.install | 28 ----------------------------
gnome-common.pth | 2 --
gnome-dbus.conf | 5 -----
gnome.profile | 18 ------------------
6 files changed, 5 insertions(+), 79 deletions(-)
Index: extra/gnome/gnome-common/PKGBUILD
diff -u extra/gnome/gnome-common/PKGBUILD:1.32 extra/gnome/gnome-common/PKGBUILD:1.33
--- extra/gnome/gnome-common/PKGBUILD:1.32 Sat Jul 7 08:17:29 2007
+++ extra/gnome/gnome-common/PKGBUILD Sat Sep 22 08:47:33 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.32 2007/07/07 12:17:29 jgc Exp $
+# $Id: PKGBUILD,v 1.33 2007/09/22 12:47:33 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-common
-pkgver=2.18.0
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
pkgdesc="Common macros for GNOME2"
arch=(i686 x86_64)
license=('GPL')
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('567172e685fc0783b1d6ab9843a85d6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('89e47677fb72695c75d2cefac84ff9f1')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gnome-common/automake1.10-support.diff
diff -u extra/gnome/gnome-common/automake1.10-support.diff:1.1 extra/gnome/gnome-common/automake1.10-support.diff:removed
--- extra/gnome/gnome-common/automake1.10-support.diff:1.1 Fri Feb 23 17:09:41 2007
+++ extra/gnome/gnome-common/automake1.10-support.diff Sat Sep 22 08:47:35 2007
@@ -1,21 +0,0 @@
---- macros2/gnome-autogen.sh
-+++ macros2/gnome-autogen.sh
-@@ -289,11 +289,13 @@
-
- case $REQUIRED_AUTOMAKE_VERSION in
- 1.4*) automake_progs="automake-1.4" ;;
-- 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
-- 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
-- 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;;
-- 1.8*) automake_progs="automake-1.8 automake-1.9" ;;
-- 1.9*) automake_progs="automake-1.9" ;;
-+ 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-+ 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-+ 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-+ 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
-+ 1.9*) automake_progs="automake-1.10 automake-1.9" ;;
-+ 1.10*) automake_progs="automake-1.10" ;;
-+
- esac
- version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
- "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
Index: extra/gnome/gnome-common/gnome-common.install
diff -u extra/gnome/gnome-common/gnome-common.install:1.7 extra/gnome/gnome-common/gnome-common.install:removed
--- extra/gnome/gnome-common/gnome-common.install:1.7 Fri Feb 11 05:27:06 2005
+++ extra/gnome/gnome-common/gnome-common.install Sat Sep 22 08:47:35 2007
@@ -1,28 +0,0 @@
-post_install() {
- if ! grep '/opt/gnome/lib' etc/ld.so.conf >/dev/null 2>&1; then
- echo "/opt/gnome/lib" >> etc/ld.so.conf
- sbin/ldconfig -r .
- fi
-}
-
-post_upgrade() {
- # Upgrade from old sitecustomize.py situation
- if [ -f usr/lib/python2.4/sire-packages/sitecustomize.py ]; then
- sed -i -e '/\/opt\/gnome\/lib\/python2.4\/site-packages/d' \
- usr/lib/python2.4/site-packages/sitecustomize.py
- if ! grep -v '^import site' usr/lib/python2.4/site-packages/sitecustomize.py >/dev/null 2>&1; then
- rm -f usr/lib/python2.4/site-packages/sitecustomize.py
- fi
- fi
- post_install $1
-}
-
-post_remove() {
- sed -i -e '/^\/opt\/gnome\/lib/d' etc/ld.so.conf
- sbin/ldconfig -r .
-}
-
-op=$1
-shift
-
-$op $*
Index: extra/gnome/gnome-common/gnome-common.pth
diff -u extra/gnome/gnome-common/gnome-common.pth:1.2 extra/gnome/gnome-common/gnome-common.pth:removed
--- extra/gnome/gnome-common/gnome-common.pth:1.2 Wed Jan 24 11:12:11 2007
+++ extra/gnome/gnome-common/gnome-common.pth Sat Sep 22 08:47:35 2007
@@ -1,2 +0,0 @@
-import site; site.addsitedir("/opt/gnome/lib/python2.5/site-packages")
-site.addsitedir("/opt/gnome/lib/python2.4/site-packages")
Index: extra/gnome/gnome-common/gnome-dbus.conf
diff -u extra/gnome/gnome-common/gnome-dbus.conf:1.2 extra/gnome/gnome-common/gnome-dbus.conf:removed
--- extra/gnome/gnome-common/gnome-dbus.conf:1.2 Mon May 29 15:54:36 2006
+++ extra/gnome/gnome-common/gnome-dbus.conf Sat Sep 22 08:47:35 2007
@@ -1,5 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <servicedir>/opt/gnome/share/dbus-1/services</servicedir>
-</busconfig>
Index: extra/gnome/gnome-common/gnome.profile
diff -u extra/gnome/gnome-common/gnome.profile:1.11 extra/gnome/gnome-common/gnome.profile:removed
--- extra/gnome/gnome-common/gnome.profile:1.11 Sun Mar 13 12:50:24 2005
+++ extra/gnome/gnome-common/gnome.profile Sat Sep 22 08:47:35 2007
@@ -1,18 +0,0 @@
-export GNOMEDIR=/opt/gnome
-export GNOME2_PATH=/opt/gnome
-export PATH=$PATH:$GNOMEDIR/bin
-export MANPATH=$MANPATH:$GNOMEDIR/man
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$GNOMEDIR/lib/pkgconfig
-export LIBGLADE_MODULE_PATH=$LIBGLADE_MODULE_PATH:$GNOMEDIR/lib/libglade/2.0
-export ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $GNOME2_PATH/share/aclocal"
-
-if [ ! -z $XDG_DATA_DIRS ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOMEDIR/share
-else
- export XDG_DATA_DIRS=$GNOMEDIR/share
-fi
-if [ ! -z $XDG_CONFIG_DIRS ]; then
- export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOMEDIR/etc/xdg
-else
- export XDG_CONFIG_DIRS=$GNOMEDIR/etc/xdg
-fi
More information about the arch-commits
mailing list