From 3c71ab5157da489b2511a8927c7846c72cf83469 Mon Sep 17 00:00:00 2001
From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Mon, 20 Jun 2011 02:07:28 +0200
Subject: [PATCH] pandora-pndstore: Updated to latest version

---
 recipes/pandora-system/pandora-pndstore.bb    | 41 ++++++-------------
 .../pandora-pndstore/op_pndstore.desktop      |  2 +-
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/recipes/pandora-system/pandora-pndstore.bb b/recipes/pandora-system/pandora-pndstore.bb
index 5338947..1786b14 100755
--- a/recipes/pandora-system/pandora-pndstore.bb
+++ b/recipes/pandora-system/pandora-pndstore.bb
@@ -1,45 +1,28 @@
 DESCRIPTION = "Download and upgrade PND packages."
-LICENSE = "GPLv2"
+LICENSE = "LGPL"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = " \
           git://github.com/Tempel/PNDstore.git;protocol=git;branch=master \
           file://_ctypes.so \
           file://op_pndstore.desktop \
-	  file://packages.py \
 "
 
-SRCREV = "af118e0619e58716ef58"
+SRCREV = "8bbc5ef07280e2e26e11"
 
 S = "${WORKDIR}/git"
 
 do_install() {
-          install -d ${D}${prefix}/pandora/scripts/pndstore/
-          install -m 0775 ${S}/PNDstore ${D}${prefix}/pandora/scripts/pndstore/PNDstore
-	  install -m 0775 ${S}/pndst ${D}${prefix}/pandora/scripts/pndstore/pndst
-	  install -m 0644 ${S}/README.rst ${D}${prefix}/pandora/scripts/pndstore/README.rst
-	  install -m 0644 ${WORKDIR}/_ctypes.so ${D}${prefix}/pandora/scripts/pndstore/_ctypes.so
-
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui 
-	  install -m 0775 ${S}/pndstore_gui/PNDstore.glade ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/PNDstore.glade
-	  install -m 0775 ${S}/pndstore_gui/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/__init__.py
-	    
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core
-	  install -m 0775 ${S}/pndstore_core/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/__init__.py
-	  install -m 0775 ${S}/pndstore_core/database_update.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/database_update.py
-	  install -m 0775 ${S}/pndstore_core/libpnd.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/libpnd.py
-	  install -m 0775 ${S}/pndstore_core/options.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/options.py
-	  install -m 0775 ${WORKDIR}/packages.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/packages.py
-
-	  install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg
-	  install -m 0775 ${S}/pndstore_core/cfg/default.cfg ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg/default.cfg
-
-	  install -d ${D}${datadir}/applications/
-          install -m 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/
-
-	  install -d ${D}${datadir}/pixmaps/
-	  install -m 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
+
+      python setup.py install --root=${D}
+
+      # A stop-gap fix to the ctypes bug.
+      # This can be removed once the python-ctypes package is made to behave correctly.
+      install -m 0644 ${WORKDIR}/_ctypes.so ${D}/usr/lib/python2.6/lib-dynload/_ctypes.so
+        
+      install -Dm 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/op_pndstore.desktop 
+      install -Dm 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
 
 }
 
diff --git a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
index f27b22d..d943b73 100644
--- a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
+++ b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
@@ -2,7 +2,7 @@
 Name=PNDstore
 Comment=Download and update software for your Pandora.
 StartupNotify=false
-Exec=python /usr/pandora/scripts/pndstore/PNDstore
+Exec=python /usr/bin/PNDstore
 Icon=/usr/share/pixmaps/op_pndstore.png
 Terminal=false
 Type=Application
-- 
2.39.5