commit bc226567be013060c4f2dae070942cd07756cb67
Author: Jan Palus <[email protected]>
Date: Thu Apr 8 21:07:57 2021 +0200
drop unused patches
domoticz-openzwave-Dev.patch | 146 -------------------------------------------
domoticz-version.patch | 9 ---
domoticz.spec | 25 +++-----
3 files changed, 10 insertions(+), 170 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index d84ffcd..c2b5af0 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -9,17 +9,14 @@ Source0:
https://github.com/domoticz/domoticz/archive/%{version}.tar.gz
# Source0-md5: fd383a13d13d0976c72f332d6db1d24e
Source1: %{name}.service
Source2: %{name}.conf
-
# Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
-Patch2: %{name}-tinyxpath.patch
+Patch0: %{name}-tinyxpath.patch
# Use system openzwave includes
-Patch3: %{name}-openzwave.patch
-# Work against Dev branch of OpenZWave upstream
-Patch4: %{name}-openzwave-Dev.patch
+Patch1: %{name}-openzwave.patch
# Fix python detection (https://github.com/domoticz/domoticz/pull/1749)
-Patch5: %{name}-python.patch
-Patch6: no-git.patch
-Patch7: boost-1.73.patch
+Patch2: %{name}-python.patch
+Patch3: no-git.patch
+Patch4: boost-1.73.patch
BuildRequires: boost-devel >= 1.66.0
BuildRequires: cereal-devel
BuildRequires: cmake >= 3.16.0
@@ -82,6 +79,11 @@ and much more. Notifications/Alerts can be sent to any
mobile device
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
APPVERSION="%{version}"
echo "#define APPVERSION ${APPVERSION##*.}" > appversion.h
@@ -89,13 +91,6 @@ echo '#define APPHASH "%{snap}"' >> appversion.h
APPDATE=$(date --date="%{date}" "+%s")
echo "#define APPDATE ${APPDATE}" >> appversion.h
-%patch2 -p1 -b.tinyxpath
-%patch3 -p1 -b.openzwave
-#%patch4 -p1 -b.openzwave-Dev
-%patch5 -p1 -b.python
-%patch6 -p1
-%patch7 -p1
-
rm -f hardware/openzwave/*.h
rm -rf hardware/openzwave/aes
rm -rf hardware/openzwave/command_classes
diff --git a/domoticz-openzwave-Dev.patch b/domoticz-openzwave-Dev.patch
deleted file mode 100644
index 9152d5c..0000000
--- a/domoticz-openzwave-Dev.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/hardware/OpenZWave.cpp b/hardware/OpenZWave.cpp
-index 1f5c341c..51b2865b 100644
---- a/hardware/OpenZWave.cpp
-+++ b/hardware/OpenZWave.cpp
-@@ -1641,19 +1641,83 @@ void COpenZWave::AddValue(const OpenZWave::ValueID
&vID, const NodeInfo *pNodeIn
- if (newInstance != 0)
- {
- _device.instanceID = newInstance;
-- if (m_pManager->GetValueAsByte(vID, &byteValue) == true)
-+ //Door lock device
-+ if (
-+ (vLabel == "Access Control") ||
-+ (vLabel == "UserCode")
-+ )
- {
-- _device.devType = ZDTYPE_SWITCH_NORMAL;
-- if (byteValue == 0)
-- _device.intvalue = 0;
-- else
-- _device.intvalue = 255;
-- InsertDevice(_device);
-+ if( ValueID::ValueType_List == vID.GetType() )
-+ {
-+ try
-+ {
-+ std::string vListStr;
-+ if
(m_pManager->GetValueListSelection(vID, &vListStr))
-+ {
-+ _device.devType =
ZDTYPE_SWITCH_NORMAL;
-+ _device.Alarm_Type = 6;
-+ _device.intvalue = 0;
-+ if (vListStr == "Access
Control - RF Lock")
-+
_device.intvalue = 24;
-+ else if (vListStr ==
"Access Control - RF Unlock")
-+
_device.intvalue = 25;
-+ else if (vListStr ==
"Access Control - Manual Lock")
-+
_device.intvalue = 21;
-+ else if (vListStr ==
"Access Control - Manual Unlock")
-+
_device.intvalue = 22;
-+ else if (vListStr ==
"Access Control - KeyPad Lock")
-+
_device.intvalue = 18;
-+ else if (vListStr ==
"Access Control - KeyPad Unlock")
-+
_device.intvalue = 19;
-+ else if (vListStr ==
"Not Active")
-+
_device.intvalue = 1;
-+ else
-+
_log.Log(LOG_STATUS, "OpenZWave: Value_Added: Unhandled List Selection: %s",
vListStr.c_str());
-+ InsertDevice(_device);
-+ }
-+ }
-+ catch (...)
-+ {
-+ _log.Log(LOG_STATUS,
"OpenZWave: Value_Added: GetValueListSelection Exception");
-+ }
-+ }
-+ else {
-+ _log.Log(LOG_STATUS, "OpenZWave:
Value_Added: Unhandled Value for Label: %s", vLabel.c_str());
-+ }
-+ }
-+ else if( ValueID::ValueType_Byte == vID.GetType() )
-+ {
-+ if (m_pManager->GetValueAsByte(vID, &byteValue)
== true)
-+ {
-+ _device.devType = ZDTYPE_SWITCH_NORMAL;
-+ if (byteValue == 0)
-+ _device.intvalue = 0;
-+ else
-+ _device.intvalue = 255;
-+ InsertDevice(_device);
-+ }
- }
-+ else
-+ {
-+ _log.Log(LOG_STATUS, "OpenZWave: Value_Added: Unhandled
Value: X, Type: %i", vID.GetType());
-+ }
- }
- else
- {
-- if (vLabel != "SourceNodeId")
-+ if (vLabel == "UserCode") {
-+ if ((vType ==
OpenZWave::ValueID::ValueType_Raw) || (vType ==
OpenZWave::ValueID::ValueType_String))
-+ {
-+ std::string strValue;
-+ if (m_pManager->GetValueAsString(vID,
&strValue) == true)
-+ _log.Log(LOG_STATUS,
"OpenZWave: Value_Added: UserCode: %s", strValue.c_str());
-+ }
-+ else
-+ {
-+ if (m_pManager->GetValueAsByte(vID,
&byteValue) == true)
-+ _log.Log(LOG_STATUS,
"OpenZWave: Value_Added: UserCode: %i", byteValue);
-+ }
-+ }
-+ else if (vLabel != "SourceNodeId")
- {
- _log.Log(LOG_STATUS, "OpenZWave: Value_Added:
Unhandled Label: %s, Unit: %s", vLabel.c_str(), vUnits.c_str());
- }
-@@ -2395,7 +2459,7 @@ void COpenZWave::UpdateValue(const OpenZWave::ValueID
&vID)
- unsigned char byteValue = 0;
- int32 intValue = 0;
- std::string strValue = "";
-- int32 lValue = 0;
-+ std::string lValue = "";
-
- if (vType == OpenZWave::ValueID::ValueType_Decimal)
- {
-@@ -2833,16 +2897,40 @@ void COpenZWave::UpdateValue(const OpenZWave::ValueID
&vID)
- }
- else if (vLabel == "Access Control")
- {
-+ if (!lValue.empty()) {
-+ if (lValue == "Access Control -
RF Lock")
-+ byteValue = 24;
-+ else if (lValue == "Access
Control - RF Unlock")
-+ byteValue = 25;
-+ else if (lValue == "Access
Control - Manual Lock")
-+ byteValue = 21;
-+ else if (lValue == "Access
Control - Manual Unlock")
-+ byteValue = 22;
-+ else if (lValue == "Access
Control - KeyPad Lock")
-+ byteValue = 18;
-+ else if (lValue == "Access
Control - KeyPad Unlock")
-+ byteValue = 19;
-+ else if (lValue == "Not Active")
-+ byteValue = 0;
-+ else
-+ byteValue = 0;
-+ }
-+
- switch (byteValue) {
- case 0x00: // Previous Events
cleared
- case 0x06: //Keypad unlock/Arm Home
-+ case 0x12: // KeyPad lock
-+ case 0x15: // Manual Lock
- case 0x17: // Door closed
-+ case 0x18: // RF operated lock
- case 0xfe: // Unkown event;
returned when retrieving the current state.
- intValue = 0;
- break;
-
- case 0x05: //Keypad Lock/Arm Away
-+ case 0x13: // KeyPad unlock
- case 0x16: // Door open
-+ case 0x19: // RF operated unlock
- default: // all others,
interpret as alarm
- intValue = 255;
- break;
diff --git a/domoticz-version.patch b/domoticz-version.patch
deleted file mode 100644
index b87fb34..0000000
--- a/domoticz-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/appversion.default 2017-07-30 05:19:41.000000000 -0500
-+++ b/appversion.default 2017-07-31 11:36:32.150644222 -0500
-@@ -1,3 +1,3 @@
--#define APPVERSION 9700
--#define APPHASH "b97777b"
--#define APPDATE 1478691222
-+#define APPVERSION 10717
-+#define APPHASH "649306c"
-+#define APPDATE 1557423720
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/domoticz.git/commitdiff/e9c32406e214bcb0cc4d1bdb36febd7690105e64
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
