From dbaf199e2034ed995b686af990c323e96681d32a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 20 Aug 2007 12:26:39 +0000
Subject: python-pygtk-1.2: catch up with renaming

---
 packages/python/python-pygtk-0.6.12/.mtn2git_empty |  0
 .../python/python-pygtk-0.6.12/remove-imlib-et-al  | 31 ----------------------
 packages/python/python-pygtk-1.2/.mtn2git_empty    |  0
 .../python-pygtk-1.2/remove-imlib-et-al.patch      | 31 ++++++++++++++++++++++
 packages/python/python-pygtk-1.2_0.6.12.bb         |  4 +--
 5 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 packages/python/python-pygtk-0.6.12/.mtn2git_empty
 delete mode 100644 packages/python/python-pygtk-0.6.12/remove-imlib-et-al
 create mode 100644 packages/python/python-pygtk-1.2/.mtn2git_empty
 create mode 100644 packages/python/python-pygtk-1.2/remove-imlib-et-al.patch

(limited to 'packages')

diff --git a/packages/python/python-pygtk-0.6.12/.mtn2git_empty b/packages/python/python-pygtk-0.6.12/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al b/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
deleted file mode 100644
index 94bb164f67..0000000000
--- a/packages/python/python-pygtk-0.6.12/remove-imlib-et-al
+++ /dev/null
@@ -1,31 +0,0 @@
-remove checking for imlib, pixbuf, gtkgl and libglade
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- pygtk-0.6.12/configure.in~remove-imlib-et-al
-+++ pygtk-0.6.12/configure.in
-@@ -45,17 +45,14 @@
- fi
- 
- AM_PATH_GTK(gtk_required_version,,,$extra_mods)
--AM_PATH_GDK_IMLIB(imlib_required_version, build_imlib=true, build_imlib=false)
--AM_CONDITIONAL(BUILD_IMLIB, $build_imlib)
- 
--AM_PATH_GDK_PIXBUF(pixbuf_required_version, build_pixbuf=true, build_pixbuf=false)
--AM_CONDITIONAL(BUILD_PIXBUF, $build_pixbuf)
-+AM_CONDITIONAL(BUILD_IMLIB, false)
- 
--AM_PATH_GTKGL(build_gtkgl=true, build_gtkgl=false)
--AM_CONDITIONAL(BUILD_GTKGL, $build_gtkgl)
-+AM_CONDITIONAL(BUILD_PIXBUF, false)
- 
--AM_PATH_LIBGLADE(build_libglade=true, build_libglade=false)
--AM_CONDITIONAL(BUILD_LIBGLADE, $build_libglade)
-+AM_CONDITIONAL(BUILD_GTKGL, false)
-+
-+AM_CONDITIONAL(BUILD_LIBGLADE, false)
- 
- 
- AC_ARG_ENABLE(numpy,
diff --git a/packages/python/python-pygtk-1.2/.mtn2git_empty b/packages/python/python-pygtk-1.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
new file mode 100644
index 0000000000..94bb164f67
--- /dev/null
+++ b/packages/python/python-pygtk-1.2/remove-imlib-et-al.patch
@@ -0,0 +1,31 @@
+remove checking for imlib, pixbuf, gtkgl and libglade
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- pygtk-0.6.12/configure.in~remove-imlib-et-al
++++ pygtk-0.6.12/configure.in
+@@ -45,17 +45,14 @@
+ fi
+ 
+ AM_PATH_GTK(gtk_required_version,,,$extra_mods)
+-AM_PATH_GDK_IMLIB(imlib_required_version, build_imlib=true, build_imlib=false)
+-AM_CONDITIONAL(BUILD_IMLIB, $build_imlib)
+ 
+-AM_PATH_GDK_PIXBUF(pixbuf_required_version, build_pixbuf=true, build_pixbuf=false)
+-AM_CONDITIONAL(BUILD_PIXBUF, $build_pixbuf)
++AM_CONDITIONAL(BUILD_IMLIB, false)
+ 
+-AM_PATH_GTKGL(build_gtkgl=true, build_gtkgl=false)
+-AM_CONDITIONAL(BUILD_GTKGL, $build_gtkgl)
++AM_CONDITIONAL(BUILD_PIXBUF, false)
+ 
+-AM_PATH_LIBGLADE(build_libglade=true, build_libglade=false)
+-AM_CONDITIONAL(BUILD_LIBGLADE, $build_libglade)
++AM_CONDITIONAL(BUILD_GTKGL, false)
++
++AM_CONDITIONAL(BUILD_LIBGLADE, false)
+ 
+ 
+ AC_ARG_ENABLE(numpy,
diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
index 90f8cb3821..a974a2471d 100644
--- a/packages/python/python-pygtk-1.2_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -8,7 +8,7 @@ SRCNAME = "pygtk"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
-           file://remove-imlib-et-al;patch=1 \
+           file://remove-imlib-et-al.patch;patch=1 \
            file://acinclude.m4"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
@@ -17,7 +17,7 @@ inherit autotools pkgconfig distutils-base
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
+#FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
-- 
cgit v1.2.3