From 5ac924b2ae31ab58df93bdba4a6557b5f76d4111 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Tue, 18 Nov 2003 15:36:02 +0000 Subject: [PATCH] Juergen Sawinski : fixed python related gnome24 build problems git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1800 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/gnome24/glib/gnome-24.conf | 3 --- package/gnome24/pygtk/pygtk.conf | 12 +++++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index eb7f8a1d3..03769a969 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -5,6 +5,7 @@ - updated xemacs-packages (2003-10-03) - fixed auctex's priority - Sebastian Czech: updated pcmcia-cs + - Juergen Sawinski: fixed python related gnome24 build problems *) 2003-11-17 (2.0.0-rc2 - 2.0.0-rc3) diff --git a/package/gnome24/glib/gnome-24.conf b/package/gnome24/glib/gnome-24.conf index efcce6992..63112f7a3 100644 --- a/package/gnome24/glib/gnome-24.conf +++ b/package/gnome24/glib/gnome-24.conf @@ -39,9 +39,6 @@ fi # index.sgml is missing almost all packages -> var_append confopt " " "--disable-gtk-doc" -#@FIXME determine python version -export PYTHONPATH="$root/$prefix/lib/python2.3/site-packages/:/usr/lib/python2.3/site-packages/" - #@FIXME remove once gnome24 is polished: configure_features() { if [ -f ./configure ] ; then diff --git a/package/gnome24/pygtk/pygtk.conf b/package/gnome24/pygtk/pygtk.conf index 1d2d401b5..8753ac628 100644 --- a/package/gnome24/pygtk/pygtk.conf +++ b/package/gnome24/pygtk/pygtk.conf @@ -20,6 +20,16 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - . $base/package/*/*/gnome-24.conf +pygtk_pi() { + # set python path + PYVER="`python -V 2>&1 | sed 's,.*\([0-9][.][0-9]\).*,\1,'`" + + cat > $root/etc/profile.d/pygtk <<-EOF +export PYTHONPATH=$PYTHONPATH${PYTHONPATH:+:}/usr/lib/python$PYVER/site-packages/:$root/$prefix/lib/python$PYVER/site-packages/gtk-2.0 +EOF +} + +hook_add postinstall 3 pygtk_pi +