[Lunar-commits] <moonbase-other> telldus-core: Added patch to not overwrite configs

[Stefan Wold]

commit 6a205abc2bbdb9f97467e99065c685ebe5a75317
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Tue, 08 Oct 2013 11:38:25 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/6a205abc2bbdb9f97467e99065c685ebe5a75317

telldus-core: Added patch to not overwrite configs

Also fixed udev rules location even if the other one was "valid"
too.
---
  libs/telldus-core/DETAILS   | +3/-0     
  libs/telldus-core/PRE_BUILD | +7/-1     
  2 files changed, 10 insertions(+), 1 deletion(-)

--- a/libs/telldus-core/DETAILS
+++ b/libs/telldus-core/DETAILS
@@ -1,8 +1,11 @@
           MODULE=telldus-core
          VERSION=2.1.1
           SOURCE=${MODULE}-${VERSION}.tar.gz
+         SOURCE2=$MODULE-2.1.1-do-not-overwrite-configs.patch
       SOURCE_URL=http://download.telldus.se/TellStick/Software/telldus-core
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:2cd194caadcc919949987156e7affee8aef54a7b
+     SOURCE2_VFY=sha1:6bbd9357f7302b24c7d427d55fc4f5f9d9e47d5c
         WEB_SITE="http://telldus.se/"
          ENTERED=20131008
          UPDATED=20131008
--- a/libs/telldus-core/PRE_BUILD
+++ b/libs/telldus-core/PRE_BUILD
@@ -1,8 +1,14 @@
 default_pre_build &&
 
+# Do not overwrite configs if exist
+patch_it $SOURCE2 1 &&
+
 # Add Missing header
 sedit '/^#else/a\\t#include <unistd.h>' common/Socket.h &&
 
 # Fix user and group
 sedit 's;plugdev;usb;' tdadmin/05-tellstick.rules &&
-sedit 's;plugdev;usb;;s;nobody;tellstick;' service/tellstick.conf
+sedit 's;plugdev;usb;;s;nobody;tellstick;' service/tellstick.conf &&
+
+# Fix udev rules dir
+sedit '/UDEV_RULES_DIR/s;/etc;/usr/lib;' tdadmin/CMakeLists.txt