Update dbus-python to 0.83.0 and makefile cleanup.

SVN-Revision: 12530

diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile
index d93f147ba338697f82e973b65b495033c47d751a..494af8e07f1682b3a2771e71d6888e1560453d59 100644 (file)
--- a/lang/python-dbus/Makefile
+++ b/lang/python-dbus/Makefile
@@ -8,14 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus-python
-PKG_VERSION:=0.82.4
-PKG_RELEASE:=1
+PKG_VERSION:=0.83.0
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus-python/
+PKG_MD5SUM:=562c78876219bf458d79a041af18293d
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 EXTRA_CFLAGS += \
        -I$(STAGING_DIR)/usr/lib/libintl/include \
        -I$(STAGING_DIR)/usr/lib/libiconv/include
@@ -28,38 +31,33 @@ define Package/dbus-python
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=python bindings for dbus
+  TITLE:=Python bindings for dbus
   URL:=http://dbus.freedesktop.org/
-  DEPENDS:=+libdbus-glib
+  DEPENDS:=python-core +libdbus-glib
 endef
 
 define Package/dbus-python/description
-  python bindings for dbus 
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
+  Python bindings for dbus.
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus/
+       $(INSTALL_DATA) $(STAGING_DIR)/usr/include/dbus-1.0/dbus/* \
+               $(1)/usr/include/dbus-1.0/dbus/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) $(STAGING_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig
 endef
 
 define Package/dbus-python/install
-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)/usr/lib/python2.5/site-packages/
+       $(INSTALL_DATA) $(STAGING_DIR)/usr/lib/python2.5/site-packages/*.{py,so,a} \
+               $(1)/usr/lib/python2.5/site-packages/
+       $(INSTALL_DIR) $(1)/usr/lib/python2.5/site-packages/dbus/
+       $(INSTALL_DATA) $(STAGING_DIR)/usr/lib/python2.5/site-packages/dbus/*.py \
+               $(1)/usr/lib/python2.5/site-packages/dbus/
+       $(INSTALL_DIR) $(1)/usr/lib/python2.5/site-packages/dbus/mainloop/
+       $(INSTALL_DATA) $(STAGING_DIR)/usr/lib/python2.5/site-packages/dbus/mainloop/*.py \
+               $(1)/usr/lib/python2.5/site-packages/dbus/mainloop/
 endef
 
 $(eval $(call BuildPackage,dbus-python))