scm-commits August 2019

scm-commits@lists.fedoraproject.org

2 participants
99898 discussions

limb pushed to duplicity (master). "0.8.04"
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 21:36:23 UTC From 53d22b07c78dab5ef093addd68b284277d0adb4f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla <gwync(a)protonmail.com> Date: Aug 31 2019 21:35:46 +0000 Subject: 0.8.04 --- diff --git a/.gitignore b/.gitignore index ff814eb..c83e25c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /duplicity-0.8.01.tar.gz /duplicity-0.8.02.tar.gz /duplicity-0.8.03.tar.gz +/duplicity-0.8.04.tar.gz diff --git a/duplicity.spec b/duplicity.spec index a6d0468..44335bd 100644 --- a/duplicity.spec +++ b/duplicity.spec @@ -2,8 +2,8 @@ Summary: Encrypted bandwidth-efficient backup using rsync algorithm Name: duplicity -Version: 0.8.03 -Release: 2%{?dist} +Version: 0.8.04 +Release: 1%{?dist} License: GPLv2+ URL: http://www.nongnu.org/duplicity/ Source: https://launchpad.net/duplicity/0.8-series/%{version}/+download/duplicity-%… @@ -71,6 +71,9 @@ rm -rf %{buildroot}/usr/share/doc/duplicity-%{version}/tarfile-LICENSE %{_sysconfdir}/%{name}/cacert.pem %changelog +* Sat Aug 31 2019 Gwyn Ciesla <gwync(a)protonmail.com> - 0.8.04-1 +- 0.8.04. + * Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 0.8.03-2 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 9355308..bb4e5db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (duplicity-0.8.03.tar.gz) = 220259d40060a12c37afe72b827f77f729b7d54c377f34ce8eb76966db5cd54df213a07e922ce62d13125a4d7347b33fe5ad9d4d679ed3fb1b980ab87a773d1b +SHA512 (duplicity-0.8.04.tar.gz) = ca39e282df9de518535f56fc2b8912426faac069df66d394f191de4ef7edf5c8ebe03623b78c793a7f2615ddb4b3af7f3010150d1fcd6918428db45c5b62b9cf https://src.fedoraproject.org/rpms/duplicity/c/53d22b07c78dab5ef093addd68b2…

1 0

limb uploaded duplicity-0.8.04.tar.gz for rpms/duplicity
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 21:35:38 UTC ca39e282df9de518535f56fc2b8912426faac069df66d394f191de4ef7edf5c8ebe03623b78c793a7f2615ddb4b3af7f3010150d1fcd6918428db45c5b62b9cf duplicity-0.8.04.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/duplicity/duplicity-0.8.0…

1 0

ignatenkobrain uploaded django-mptt-0.10.0.tar.gz for rpms/python-django-mptt
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 21:13:53 UTC 8d20232f1a24991187321b680aff40a34ff06d43ed7231d43be1576bc51c61941b01ec0123efd4500097e0baee7fd31da16560d22e34f30e9e57fb217350fec7 django-mptt-0.10.0.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/python-django-mptt/django…

1 0

ignatenkobrain uploaded django-tables2-2.1.0.tar.gz for rpms/python-django-tables2
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 21:02:15 UTC 8e0b12bad0a5ee726f4f6eb1742e6292f23f418235d6ec4dd8da3e74f762a27efd153611fe620769e21581c249776ebdc427019976833c390c02b407dde0cced django-tables2-2.1.0.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/python-django-tables2/dja…

1 0

chedi uploaded testinfra-3.1.0.tar.gz for rpms/python-testinfra
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 20:42:12 UTC 20420e9ff27e7a09105e1ff82dc096290b20269baff73721142428f9df849bd1ecb498b0c39b3d1358c15776fbef015e735561dd0d7a4b7b390a3871d5a2d3be testinfra-3.1.0.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/python-testinfra/testinfr…

1 0

ignatenkobrain uploaded django-debug-toolbar-2.0.tar.gz for rpms/python-django-debug-toolbar
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 20:38:02 UTC b1f7dbb5ef936d81bff635167a5f5e4316edf693c9dfcce03080d49af18ba6a2b7fdc24629c59e4adbe0b19661b48d3a75566d0573db240bfcc2c0ff6afa24de django-debug-toolbar-2.0.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/python-django-debug-toolb…

1 0

chedi uploaded testinfra-3.1.0.tar.gz for rpms/python-testinfra
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 20:30:16 UTC 7df0393e0b7fa8cd69820de2a7e0533589c738161469d5f3fedb5f289126cb439301230bab0fdfaee24dd6db3c37b55ce92ce6df1187265e6f933d2135a1fa12 testinfra-3.1.0.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/python-testinfra/testinfr…

1 0

mooninite pushed to openzwave (f31). "Update to 1.6.899"
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 20:26:14 UTC From 28db951d3b7aa1f22aeff230470bad5cb1142c5e Mon Sep 17 00:00:00 2001 From: Michael Cronenworth <mike(a)cchtml.com> Date: Aug 31 2019 19:49:31 +0000 Subject: Update to 1.6.899 --- diff --git a/.gitignore b/.gitignore index 193c59e..0305b3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/openzwave-1e36dcc.tar.gz +/openzwave-1.6.899.tar.gz diff --git a/openzwave-1.6-SwitchMultilevel.patch b/openzwave-1.6-SwitchMultilevel.patch new file mode 100644 index 0000000..6be14cf --- /dev/null +++ b/openzwave-1.6-SwitchMultilevel.patch @@ -0,0 +1,58 @@ +--- a/cpp/src/command_classes/SwitchMultilevel.cpp 2019-08-27 15:55:50.000000000 -0500 ++++ b/cpp/src/command_classes/SwitchMultilevel.cpp 2019-08-31 14:37:31.909343095 -0500 +@@ -427,31 +427,31 @@ + msg->SetInstance(this, _instance); + msg->Append(GetNodeId()); + +- if (GetVersion() >= 2) +- { +- Internal::VC::ValueByte* durationValue = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)); +- uint8 duration = durationValue->GetValue(); +- durationValue->Release(); +- if (duration == 0xff) +- { +- Log::Write(LogLevel_Info, GetNodeId(), " Duration: Default"); +- } +- else if (duration >= 0x80) +- { +- Log::Write(LogLevel_Info, GetNodeId(), " Duration: %d minutes", duration - 0x7f); +- } +- else +- { +- Log::Write(LogLevel_Info, GetNodeId(), " Duration: %d seconds", duration); +- } ++ //if (GetVersion() >= 2) ++ //{ ++ //Internal::VC::ValueByte* durationValue = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)); ++ //uint8 duration = durationValue->GetValue(); ++ //durationValue->Release(); ++ //if (duration == 0xff) ++ //{ ++ //Log::Write(LogLevel_Info, GetNodeId(), " Duration: Default"); ++ //} ++ //else if (duration >= 0x80) ++ //{ ++ //Log::Write(LogLevel_Info, GetNodeId(), " Duration: %d minutes", duration - 0x7f); ++ //} ++ //else ++ //{ ++ //Log::Write(LogLevel_Info, GetNodeId(), " Duration: %d seconds", duration); ++ //} + +- msg->Append(4); +- msg->Append(GetCommandClassId()); +- msg->Append(SwitchMultilevelCmd_Set); +- msg->Append(_level); +- msg->Append(duration); +- } +- else ++ //msg->Append(4); ++ //msg->Append(GetCommandClassId()); ++ //msg->Append(SwitchMultilevelCmd_Set); ++ //msg->Append(_level); ++ //msg->Append(duration); ++ //} ++ //else + { + msg->Append(3); + msg->Append(GetCommandClassId()); diff --git a/openzwave.spec b/openzwave.spec index cb9480b..354f05b 100644 --- a/openzwave.spec +++ b/openzwave.spec @@ -1,21 +1,14 @@ -%global commit0 1e36dcc7ee21cb3d72bae53e4dca73690053e304 -%global short0 %(c=%{commit0}; echo ${c:0:7}) - Name: openzwave -Version: 1.5.0 -Release: 0.20180625git%{short0}.0%{?dist} +Version: 1.6.899 +Release: 1%{?dist} Summary: Sample Executables for OpenZWave URL: http://www.openzwave.net License: LGPLv3+ -#Source0: http://old.openzwave.com/downloads/openzwave-%{version}.tar.gz -Source0: https://github.com/OpenZWave/open-zwave/archive/%{commit0}.tar.gz#/%{name}-… +Source0: http://old.openzwave.com/downloads/openzwave-%{version}.tar.gz +#Source0: https://github.com/OpenZWave/open-zwave/archive/%{commit0}.tar.gz#/%{name}-… -# Use system tinyxml -Patch1: openzwave-tinyxml.patch -# Use system hidapi -Patch2: openzwave-hidapi.patch -# Fix FTBFS -Patch3: openzwave-1.5.0-format.patch +# New SwitchMultilevel command class support is broken so disable it +Patch1: openzwave-1.6-SwitchMultilevel.patch BuildRequires: gcc-c++ BuildRequires: doxygen @@ -62,17 +55,30 @@ applications using openzwave %prep -%setup -q -n open-zwave-%{commit0} -%patch1 -p1 -b.tinyxml -%patch2 -p1 -b.hidapi -%patch3 -p1 -b.format +%setup -q -n %{name}-%{version} +%patch1 -p1 -b.switchmultilevel +# don't use projects compiler flags +sed -i 's/^RELEASE_CFLAGS.*/RELEASE_CFLAGS :=/' cpp/build/Makefile +sed -i 's/^RELEASE_CFLAGS.*/RELEASE_CFLAGS :=/' cpp/examples/MinOZW/Makefile %build major_ver=$(echo %{version} | awk -F \. {'print $1'}) minor_ver=$(echo %{version} | awk -F \. {'print $2'}) revision=$(echo %{version} | awk -F \. {'print $3'}) -CPPFLAGS="%{optflags} -Wformat -DOPENZWAVE_ENABLE_EXCEPTIONS" LDFLAGS="%{__global_ldflags}" VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags} +CFLAGS="-fPIC -DNDEBUG -Wformat %{optflags} '-DSYSCONFDIR=\"%{_sysconfdir}/openzwave/\"' -DOPENZWAVE_ENABLE_EXCEPTIONS" \ +LDFLAGS="%{__global_ldflags}" \ +VERSION_MAJ=$major_ver \ +VERSION_MIN=$minor_ver \ +VERSION_REV=$revision \ +PREFIX=/usr \ +sysconfdir=%{_sysconfdir}/openzwave/ \ +includedir=%{_includedir} \ +docdir=%{_defaultdocdir}/openzwave-%{version} \ +instlibdir=%{_libdir} \ +USE_HID=1 \ +USE_BI_TXML=0 \ +make %{?_smp_mflags} SHELL='sh -x' %install @@ -85,13 +91,27 @@ mkdir -p %{buildroot}/%{_libdir} mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/ mkdir -p %{buildroot}/%{_sysconfdir}/ mkdir -p %{buildroot}/%{_includedir}/openzwave/ -DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install +DESTDIR=%{buildroot} \ +VERSION_MAJ=$major_ver \ +VERSION_MIN=$minor_ver \ +VERSION_REV=$revision \ +PREFIX=/usr \ +sysconfdir=%{_sysconfdir}/openzwave/ \ +includedir=%{_includedir}/openzwave/ \ +docdir=%{_defaultdocdir}/openzwave-%{version} \ +instlibdir=%{_libdir} \ +USE_HID=1 \ +USE_BI_TXML=0 \ +make install rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/ rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/default.htm rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/general/ rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/images+css/ rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/ +# Upstream does not use it anymore +# https://github.com/OpenZWave/open-zwave/commit/d62a9fd09b14303bf27323758f4a… +rm -f %{buildroot}%{_defaultdocdir}/openzwave-%{version}/ChangeLog.old %files @@ -99,7 +119,7 @@ rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/ %files -n libopenzwave -%license license/*.txt +%license licenses/*.txt %doc docs/default.htm docs/general/ docs/images+css/ %{_libdir}/libopenzwave.so.* %dir %{_sysconfdir}/openzwave/ @@ -121,6 +141,9 @@ rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/ %changelog +* Sat Aug 31 2019 Michael Cronenworth <mike(a)cchtml.com> - 1.6.899-1 +- Version update + * Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.0-0.20180625git1e36dcc.0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index ce0bb9c..626ad23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openzwave-1e36dcc.tar.gz) = debe7295e8fdbb2501d683e234937d2807e30bccc0058b34639902b225506d0021c0a3c3487ecdbb3c74826cc650aade7724cad5f27aebd108301f3db34be5a8 +SHA512 (openzwave-1.6.899.tar.gz) = 2ed4bcd91d4c98e55bc5944ea041bb43aa26ecb8a90b51fee8f0adee0f0353fffa6eb5f0038e53f2a089ea224283c4912f95acc6a4c3c9fa9e0cf72fea78e5ac https://src.fedoraproject.org/rpms/openzwave/c/28db951d3b7aa1f22aeff230470b…

1 0

mooninite pushed to domoticz (f30). "Update to today's master git checkout - 2019-08-31"
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 20:12:59 UTC From af0f3ae6167e491f01c333ab6dc28327d37fa68c Mon Sep 17 00:00:00 2001 From: Michael Cronenworth <mike(a)cchtml.com> Date: Aug 31 2019 20:12:41 +0000 Subject: Update to today's master git checkout - 2019-08-31 --- diff --git a/.gitignore b/.gitignore index 29ac0bb..a86cd47 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/domoticz-4.9700.tar.gz +/domoticz-4.10718.tar.gz diff --git a/domoticz-appversion b/domoticz-appversion new file mode 100644 index 0000000..211e184 --- /dev/null +++ b/domoticz-appversion @@ -0,0 +1,3 @@ +#define APPVERSION 10718 +#define APPHASH "649306c" +#define APPDATE 1557423720 diff --git a/domoticz-cp-js.patch b/domoticz-cp-js.patch deleted file mode 100644 index acb38ff..0000000 --- a/domoticz-cp-js.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/www/ozwcp/cp.js 2017-07-30 05:19:41.000000000 -0500 -+++ b/www/ozwcp/cp.js 2018-02-22 17:14:52.185486298 -0600 -@@ -241,7 +241,13 @@ - var current = values[j].getAttribute('current'); - nodes[id].values[k].value = new Array(); - for (var l = 0; l < items.length; l++) { -- nodes[id].values[k].value[l] = {item: items[l].firstChild.nodeValue, selected: (current == items[l].firstChild.nodeValue)}; -+ var firstChild = items[l].firstChild; -+ var nodeValue; -+ if (firstChild == null) -+ nodeValue = ''; -+ else -+ nodeValue = firstChild.nodeValue; -+ nodes[id].values[k].value[l] = {item: nodeValue, selected: (current == nodeValue)}; - } - } else if (values[j].firstChild != null) - nodes[id].values[k].value = values[j].firstChild.nodeValue; 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-openzwave.patch b/domoticz-openzwave.patch index 84cabdb..c53bb90 100644 --- a/domoticz-openzwave.patch +++ b/domoticz-openzwave.patch @@ -2,15 +2,28 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 42082192..f16726f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -682,7 +682,7 @@ endif() +@@ -298,9 +298,9 @@ + ADD_CUSTOM_TARGET(revisiontag ALL) + + # creates appversion.h using cmake script +-ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND} +- -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} +- -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake) ++#ADD_CUSTOM_COMMAND(TARGET revisiontag COMMAND ${CMAKE_COMMAND} ++# -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} ++# -P ${CMAKE_CURRENT_SOURCE_DIR}/getgit.cmake) + + ## Target + set( +@@ -700,7 +700,7 @@ IF(OpenZWave) message(STATUS ${OpenZWave}) target_link_libraries(domoticz ${OpenZWave}) - include_directories(${CMAKE_SOURCE_DIR}/hardware/openzwave) + include_directories(${OPENZWAVE_INCLUDE_DIRS}) add_definitions(-DWITH_OPENZWAVE) - # open-zwave needs libudev if statically linked - IF(USE_STATIC_OPENZWAVE) + ELSE() + MESSAGE(STATUS "==== OpenZWave not found, support disabled!") diff --git a/hardware/openzwave/control_panel/ozwcp.cpp b/hardware/openzwave/control_panel/ozwcp.cpp index ffd8d742..79c708ce 100644 --- a/hardware/openzwave/control_panel/ozwcp.cpp @@ -29,9 +42,9 @@ index ffd8d742..79c708ce 100644 +#include <Node.h> +#include <Group.h> +#include <Notification.h> + #include "..//main/Logger.h" #include <sys/stat.h> - #include <fstream> diff --git a/hardware/openzwave/control_panel/ozwcp.h b/hardware/openzwave/control_panel/ozwcp.h index 29ebc0e3..7a027815 100644 --- a/hardware/openzwave/control_panel/ozwcp.h @@ -45,5 +58,5 @@ index 29ebc0e3..7a027815 100644 +#include <Driver.h> +#include <Notification.h> - using namespace OpenZWave; + #define MAX_NODES 255 diff --git a/domoticz-python.patch b/domoticz-python.patch index e6332de..c580ab5 100644 --- a/domoticz-python.patch +++ b/domoticz-python.patch @@ -17,26 +17,28 @@ diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h index 25c83f034..ecf19da09 100644 --- a/hardware/plugins/DelayedLink.h +++ b/hardware/plugins/DelayedLink.h -@@ -126,16 +126,10 @@ namespace Plugins { +@@ -150,18 +150,10 @@ if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll"); if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll"); # else +- if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll"); - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll"); -+ if (!shared_lib_) shared_lib_ = LoadLibrary("python3.dll"); ++ if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll"); # endif #else +- if (!shared_lib_) FindLibrary("python3.8", true); - if (!shared_lib_) FindLibrary("python3.7", true); - if (!shared_lib_) FindLibrary("python3.6", true); - if (!shared_lib_) FindLibrary("python3.5", true); - if (!shared_lib_) FindLibrary("python3.4", true); + if (!shared_lib_) FindLibrary("python3", true); - #endif - if (shared_lib_) - { -@@ -232,24 +226,12 @@ namespace Plugins { + #ifdef __FreeBSD__ + if (!shared_lib_) FindLibrary("python3.7m", true); + if (!shared_lib_) FindLibrary("python3.6m", true); +@@ -271,24 +263,12 @@ library = "lib" + sLibrary + ".so"; shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); } @@ -61,7 +63,7 @@ index 25c83f034..ecf19da09 100644 // look in /usr/local/lib directory (handles build from source) if (!shared_lib_) { -@@ -257,12 +239,6 @@ namespace Plugins { +@@ -296,12 +276,6 @@ shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); } @@ -71,6 +73,6 @@ index 25c83f034..ecf19da09 100644 - library = "/usr/local/lib/lib" + sLibrary + "m.so"; - shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL); - } - } - else - { + // MacOS + // look for .dylib in /usr/local/lib + if (!shared_lib_) diff --git a/domoticz-tinyxpath.patch b/domoticz-tinyxpath.patch index bb24e7c..84874c0 100644 --- a/domoticz-tinyxpath.patch +++ b/domoticz-tinyxpath.patch @@ -93,7 +93,7 @@ index bc231d8f6..334f203a6 100644 # SET(OperatingSystem "Linux") --- a/hardware/OnkyoAVTCP.cpp 2018-06-23 09:18:06.000000000 -0500 +++ b/hardware/OnkyoAVTCP.cpp 2018-07-08 14:21:06.884163094 -0500 -@@ -3,16 +3,16 @@ +@@ -3,15 +3,15 @@ #include "../main/Logger.h" #include "../main/Helper.h" #include "../main/SQLHelper.h" @@ -107,7 +107,6 @@ index bc231d8f6..334f203a6 100644 +#include <iostream> #include <sstream> - #include <map> +#include <tinyxml.h> #define RETRY_DELAY 30 diff --git a/domoticz-version.patch b/domoticz-version.patch index 33c66a9..b87fb34 100644 --- a/domoticz-version.patch +++ b/domoticz-version.patch @@ -1,9 +1,9 @@ --- 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 5876 +-#define APPVERSION 9700 -#define APPHASH "b97777b" -#define APPDATE 1478691222 -+#define APPVERSION 9700 -+#define APPHASH "2772d9f" -+#define APPDATE 1529763480 ++#define APPVERSION 10717 ++#define APPHASH "649306c" ++#define APPDATE 1557423720 diff --git a/domoticz.spec b/domoticz.spec index d128fe2..fb15720 100644 --- a/domoticz.spec +++ b/domoticz.spec @@ -1,6 +1,6 @@ Name: domoticz -Version: 4.9700 -Release: 6%{?dist} +Version: 4.10718 +Release: 0.git20190831.1%{?dist} Summary: Open source Home Automation System License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT @@ -8,6 +8,7 @@ URL: http://www.domoticz.com Source0: https://github.com/domoticz/domoticz/archive/%{version}.tar.gz#/%{name}-%{v… Source1: %{name}.service Source2: %{name}.conf +Source3: %{name}-appversion # Source says its version 3.5876, but it's really 4.9700 Patch1: %{name}-version.patch @@ -15,14 +16,8 @@ Patch1: %{name}-version.patch Patch2: %{name}-tinyxpath.patch # Use system openzwave includes Patch3: %{name}-openzwave.patch -# Work against Dev branch of OpenZWave upstream -Patch4: %{name}-openzwave-Dev.patch # Fix python detection (https://github.com/domoticz/domoticz/pull/1749) -Patch5: %{name}-python.patch -# OZWCP bug with empty list values -Patch6: %{name}-cp-js.patch -# Python 3.7 support (https://github.com/domoticz/domoticz/pull/2534) -Patch7: %{name}-python37.patch +Patch4: %{name}-python.patch BuildRequires: boost-devel BuildRequires: cmake @@ -30,7 +25,7 @@ BuildRequires: curl-devel BuildRequires: fontpackages-devel BuildRequires: gcc-c++ BuildRequires: git -BuildRequires: libopenzwave-devel >= 1.5.0 +BuildRequires: libopenzwave-devel >= 1.6.0 BuildRequires: libusb-devel BuildRequires: lua-devel BuildRequires: mosquitto-devel @@ -87,14 +82,11 @@ any mobile device %prep -%setup -q -%patch1 -p1 -b.version +%setup -q -n %{name}-development +#patch1 -p1 -b.version %patch2 -p1 -b.tinyxpath %patch3 -p1 -b.openzwave -%patch4 -p1 -b.openzwave-Dev -%patch5 -p1 -b.python -%patch6 -p1 -b.ozwcp-cp-js -%patch7 -p1 -b.python37 +%patch4 -p1 -b.python rm -f hardware/openzwave/*.h rm -rf hardware/openzwave/aes rm -rf hardware/openzwave/command_classes @@ -102,10 +94,12 @@ rm -rf hardware/openzwave/platform rm -rf hardware/openzwave/value_classes rm -rf sqlite/ rm -rf tinyxpath/ +cp -p %{SOURCE3} ./appversion.h %build %cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_STATIC_LIBSTDCXX=NO \ -DUSE_STATIC_OPENZWAVE=NO \ -DUSE_OPENSSL_STATIC=NO \ @@ -195,6 +189,13 @@ usermod -G domoticz,dialout domoticz %changelog +* Sat Aug 31 2019 Michael Cronenworth <mike(a)cchtml.com> - 4.10718-0.git20190831.1 +- Version update to current master git checkout +- Compile against OpenZWave 1.6 + +* Sat May 11 2019 Michael Cronenworth <mike(a)cchtml.com> - 4.10717-1 +- Version update + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.9700-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 6c8f088..afe80f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (domoticz-4.9700.tar.gz) = f677a082b5ac4057142a6b71998d0e08042481821ceb2760a07af3745fc8900279e6b469e244fd3a08bb2dabf9efd903dd1e0c54adc726a09754594484bb92f6 +SHA512 (domoticz-4.10718.tar.gz) = 3f969374fe16bf4d241f6f47967bf4f90be91c9f4f376285cc834c0a31c02952cb6fc9393a361d4a2206471ef9677a4ae95bf92ab942db2d1468b72e4e0ac5c7 https://src.fedoraproject.org/rpms/domoticz/c/af0f3ae6167e491f01c333ab6dc28…

1 0

mooninite uploaded domoticz-4.10718.tar.gz for rpms/domoticz
by notifications＠fedoraproject.org 31 Aug '19

31 Aug '19

Notification time stamped 2019-08-31 19:58:10 UTC 3f969374fe16bf4d241f6f47967bf4f90be91c9f4f376285cc834c0a31c02952cb6fc9393a361d4a2206471ef9677a4ae95bf92ab942db2d1468b72e4e0ac5c7 domoticz-4.10718.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/domoticz/domoticz-4.10718…

1 0

← Newer
1
2
3
4
5
6
7
...
9990
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2019