From d26f4f69588807dc68e2e79f23835a44c05a1671 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 31 May 2011 21:36:35 +0000
Subject: gammu: Upgrade to version 1.29.0 and fix build.

Signed-off-by: Stanislav Brabec <utx@penguin.cz>
---
 recipes/gammu/gammu_1.26.1.bb | 38 --------------------------------------
 recipes/gammu/gammu_1.29.0.bb | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 recipes/gammu/gammu_1.26.1.bb
 create mode 100644 recipes/gammu/gammu_1.29.0.bb

diff --git a/recipes/gammu/gammu_1.26.1.bb b/recipes/gammu/gammu_1.26.1.bb
deleted file mode 100644
index 7b88a525ac..0000000000
--- a/recipes/gammu/gammu_1.26.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "GNU All Mobile Managment Utilities"
-SECTION = "console/network"
-DEPENDS = "bluez-libs cmake-native python mysql"
-RDEPENDS_python-${PN} = "python-core"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gammu.org/"
-PR = "r0"
-
-SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2"
-
-inherit distutils-common-base cmake
-
-do_configure() {
-    cd ${S}
-    sed -i 's@^cmake [^$]*\$@cmake -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_TARGET} $@' configure
-    sed -i 's@\${PYTHON_SITEDIR}@${PYTHON_SITEPACKAGES_DIR}@g' python/gammu/CMakeLists.txt
-    ./configure --prefix=${prefix} --enable-shared --enable-backup
-}
-
-# gammu has a non-standard uninstalled .pc file, which confuses pkgconfig.bbclass.
-# Replace it by custom do_stage_append():
-#do_stage_append () {
-#	install -d ${PKG_CONFIG_DIR}
-#	cat build-configure/cfg/gammu.pc > ${PKG_CONFIG_DIR}/gammu.pc
-#}
-
-PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}"
-
-FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu"
-FILES_${PN}-smsd = "${bindir}/gammu-smsd*"
-FILES_${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so"
-FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug"
-FILES_libgammu = "${libdir}/libGammu.so.*"
-FILES_libgsmsd = "${libdir}/libgsmsd.so.*"
-FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??"
-
-SRC_URI[md5sum] = "ba8caab6b21a2ce0fa668f9403b8319a"
-SRC_URI[sha256sum] = "668eb037af6aa81cc104067dcb8e1cf44000b82a58638cfd485297eec76fda8d"
diff --git a/recipes/gammu/gammu_1.29.0.bb b/recipes/gammu/gammu_1.29.0.bb
new file mode 100644
index 0000000000..b8c88ac739
--- /dev/null
+++ b/recipes/gammu/gammu_1.29.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "GNU All Mobile Managment Utilities"
+SECTION = "console/network"
+DEPENDS = "bluez-libs cmake-native python mysql"
+RDEPENDS_python-${PN} = "python-core"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gammu.org/"
+PR = "r0"
+
+SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2"
+
+inherit distutils-common-base cmake
+
+# FIXME: Ugly!
+PYTHON_VERSION = "2.6"
+do_configure() {
+    cd ${S}
+    sed -i 's@^cmake [^$]*\$@cmake -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_TARGET} -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/python${PYTHON_VERSION} $@' configure
+    sed -i 's@\${PYTHON_SITEDIR}@${PYTHON_SITEPACKAGES_DIR}@g' python/gammu/CMakeLists.txt
+    ./configure --prefix=${prefix} --enable-shared --enable-backup
+}
+
+PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}"
+
+FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu"
+FILES_${PN}-smsd = "${bindir}/gammu-smsd*"
+FILES_${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so"
+FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug"
+FILES_libgammu = "${libdir}/libGammu.so.*"
+FILES_libgsmsd = "${libdir}/libgsmsd.so.*"
+FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??"
+
+SRC_URI[md5sum] = "5a860f37519fab3d2e7a42349b413738"
+SRC_URI[sha256sum] = "0f7c3122e5f5e246b3ce7fb128b42c1d679ebb3f11f805ea17f1ba86400e1bbf"
-- 
cgit 1.2.3-korg