Update to 2020.2
This commit is contained in:
parent
9d9f230f28
commit
8f1bf90803
|
@ -1 +1 @@
|
|||
/domoticz-2020.1.tar.gz
|
||||
/domoticz-2020.2.tar.gz
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#define APPVERSION 11804
|
||||
#define APPHASH "77b93f1"
|
||||
#define APPDATE 1584835200
|
||||
#define APPVERSION 11995
|
||||
#define APPHASH "b63341b"
|
||||
#define APPDATE 1587859200
|
||||
|
|
|
@ -1,62 +1,19 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 42082192..f16726f8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -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})
|
||||
@@ -707,13 +707,9 @@
|
||||
message(STATUS "OpenZWave library found at: ${OpenZWave}")
|
||||
target_link_libraries(domoticz ${OpenZWave})
|
||||
- include_directories(${CMAKE_SOURCE_DIR}/hardware/openzwave)
|
||||
+ include_directories(${OPENZWAVE_INCLUDE_DIRS})
|
||||
add_definitions(-DWITH_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
|
||||
+++ b/hardware/openzwave/control_panel/ozwcp.cpp
|
||||
@@ -39,11 +39,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
-#include "../Options.h"
|
||||
-#include "../Manager.h"
|
||||
-#include "../Node.h"
|
||||
-#include "../Group.h"
|
||||
-#include "../Notification.h"
|
||||
+#include <Options.h>
|
||||
+#include <Manager.h>
|
||||
+#include <Node.h>
|
||||
+#include <Group.h>
|
||||
+#include <Notification.h>
|
||||
#include "../../../main/Logger.h"
|
||||
|
||||
#include <sys/stat.h>
|
||||
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
|
||||
+++ b/hardware/openzwave/control_panel/ozwcp.h
|
||||
@@ -37,8 +37,8 @@
|
||||
|
||||
#include <list>
|
||||
#include <algorithm>
|
||||
-#include "../Driver.h"
|
||||
-#include "../Notification.h"
|
||||
+#include <Driver.h>
|
||||
+#include <Notification.h>
|
||||
|
||||
#define MAX_NODES 255
|
||||
- find_path(OPENZWAVE_INCLUDE_DIRS NAMES openzwave/Manager.h)
|
||||
+ find_path(OPENZWAVE_INCLUDE_DIRS NAMES Manager.h)
|
||||
if (OPENZWAVE_INCLUDE_DIRS)
|
||||
- IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
- include_directories(${OPENZWAVE_INCLUDE_DIRS})
|
||||
- ELSE()
|
||||
- include_directories(${OPENZWAVE_INCLUDE_DIRS}/openzwave)
|
||||
- ENDIF()
|
||||
+ include_directories(${OPENZWAVE_INCLUDE_DIRS})
|
||||
message(STATUS "OpenZWave includes found at: ${OPENZWAVE_INCLUDE_DIRS}")
|
||||
else()
|
||||
message(FATAL_ERROR "OpenZWave includes not found. Did you not issue 'sudo make install' after building OpenZWave?")
|
||||
|
||||
|
|
|
@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||
index 42082192..f16726f8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -662,7 +646,7 @@
|
||||
@@ -744,7 +769,7 @@
|
||||
message(STATUS "Not found telldus-core (telldus-core.h), not adding tellstick support")
|
||||
endif (TELLDUSCORE_INCLUDE)
|
||||
|
||||
-target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${JSONCPP_LIBRARIES})
|
||||
+target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread -lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -lm ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${JSONCPP_LIBRARIES})
|
||||
-target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
|
||||
+target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread -lpython3.8 -lcrypt -lpthread -ldl -lutil -lm -lm ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES})
|
||||
|
||||
IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
target_link_libraries(domoticz -lresolv)
|
||||
|
|
|
@ -20,7 +20,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||
index bc231d8f6..334f203a6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -455,22 +455,6 @@
|
||||
@@ -365,22 +365,6 @@
|
||||
webserver/server.cpp
|
||||
webserver/Websockets.cpp
|
||||
webserver/WebsocketHandler.cpp
|
||||
|
@ -41,9 +41,9 @@ index bc231d8f6..334f203a6 100644
|
|||
-tinyxpath/xpath_static.cpp
|
||||
-tinyxpath/xpath_syntax.cpp
|
||||
)
|
||||
add_executable(domoticz ${domoticz_SRCS} ${domoticz_jsoncpp_SRCS})
|
||||
|
||||
@@ -658,6 +642,47 @@
|
||||
add_executable(domoticz ${domoticz_SRCS})
|
||||
@@ -682,6 +666,47 @@
|
||||
ENDIF(LIBUSB_FOUND)
|
||||
endif(WITH_LIBUSB)
|
||||
|
||||
|
@ -120,11 +120,11 @@ index bc231d8f6..334f203a6 100644
|
|||
#include "DelayedLink.h"
|
||||
--- a/hardware/plugins/Plugins.cpp 2020-03-22 09:16:16.000000000 -0500
|
||||
+++ b/hardware/plugins/Plugins.cpp 2020-03-24 13:45:46.056965796 -0500
|
||||
@@ -17,10 +17,11 @@
|
||||
#include "../main/SQLHelper.h"
|
||||
#include "../main/mainworker.h"
|
||||
#include "../main/localtime_r.h"
|
||||
-#include "../tinyxpath/tinyxml.h"
|
||||
@@ -16,10 +16,11 @@
|
||||
#include "../../main/SQLHelper.h"
|
||||
#include "../../main/mainworker.h"
|
||||
#include "../../main/localtime_r.h"
|
||||
-#include "../../tinyxpath/tinyxml.h"
|
||||
|
||||
#include "../../notifications/NotificationHelper.h"
|
||||
|
||||
|
@ -170,12 +170,13 @@ index bc231d8f6..334f203a6 100644
|
|||
#include "../main/localtime_r.h"
|
||||
#include "../main/mainworker.h"
|
||||
#include "../hardware/hardwaretypes.h"
|
||||
#include "../json/json.h"
|
||||
-#include <json/json.h>
|
||||
-#include "../tinyxpath/tinyxml.h"
|
||||
#include "../main/WebServer.h"
|
||||
|
||||
+#include <iostream>
|
||||
#include <sstream>
|
||||
+#include <json/json.h>
|
||||
+#include <tinyxml.h>
|
||||
|
||||
#define RETRY_DELAY 30
|
||||
|
|
|
@ -8,6 +8,5 @@ SSLDHPARAM=""
|
|||
APP_ROOT="/usr/share/domoticz"
|
||||
DBASE="/var/lib/domoticz/domoticz.db"
|
||||
USERDATA="/var/lib/domoticz/"
|
||||
LOG="/var/log/domoticz.log"
|
||||
LOGLEVEL="1"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ Description=Domoticz Home Automation Server
|
|||
User=domoticz
|
||||
Group=domoticz
|
||||
EnvironmentFile=/etc/sysconfig/domoticz
|
||||
ExecStart=/usr/bin/domoticz -www $WWW_PORT -sslwww $SSL_PORT -sslcert $SSLCERT -sslpass $SSLPASS -sslmethod $SSLMETHOD -ssloptions $SSLOPTIONS -ssldhparam $SSLDHPARAM -approot $APP_ROOT -dbase $DBASE -userdata $USERDATA -log $LOG -loglevel $LOGLEVEL
|
||||
ExecStart=/usr/bin/domoticz -www $WWW_PORT -sslwww $SSL_PORT -sslcert $SSLCERT -sslpass $SSLPASS -sslmethod $SSLMETHOD -ssloptions $SSLOPTIONS -ssldhparam $SSLDHPARAM -approot $APP_ROOT -dbase $DBASE -userdata $USERDATA -loglevel $LOGLEVEL
|
||||
WorkingDirectory=/usr/share/domoticz
|
||||
# Give the right to open priviliged ports. This allows you to run on a port <1024 without root permissions (user/group setting above)
|
||||
#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
#global git_hash df9de7020c4317a484c39f7330e6d1c9ca3d9ec9
|
||||
|
||||
Name: domoticz
|
||||
Version: 2020.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2020.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Open source Home Automation System
|
||||
|
||||
License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT
|
||||
|
@ -25,14 +25,17 @@ Patch3: %{name}-python.patch
|
|||
Patch4: %{name}-python38.patch
|
||||
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cereal-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: fontpackages-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: git
|
||||
BuildRequires: jsoncpp-devel
|
||||
BuildRequires: libopenzwave-devel >= 1.6.0
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: lua-devel
|
||||
BuildRequires: minizip-devel
|
||||
BuildRequires: mosquitto-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: python3-devel
|
||||
|
@ -111,7 +114,9 @@ cp -p %{SOURCE3} ./appversion.h
|
|||
-DUSE_STATIC_LIBSTDCXX=NO \
|
||||
-DUSE_STATIC_OPENZWAVE=NO \
|
||||
-DUSE_OPENSSL_STATIC=NO \
|
||||
-DUSE_BUILTIN_JSONCPP=NO \
|
||||
-DUSE_BUILTIN_LUA=NO \
|
||||
-DUSE_BUILTIN_MINIZIP=NO \
|
||||
-DUSE_BUILTIN_MQTT=NO \
|
||||
-DUSE_BUILTIN_SQLITE=NO \
|
||||
-DUSE_BUILTIN_TINYXPATH=NO \
|
||||
|
@ -229,6 +234,9 @@ usermod -G domoticz,dialout domoticz
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 27 2020 Michael Cronenworth <mike@cchtml.com> - 2020.2-1
|
||||
- New stable release
|
||||
|
||||
* Tue Apr 21 2020 Michael Cronenworth <mike@cchtml.com> - 2020.1-2
|
||||
- Fix dzVents (RHBZ#1759558)
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (domoticz-2020.1.tar.gz) = 6efc1c2b2da8d944a0501c0cb4802b46cd5998dc170507d9555ea6cd31930185bb879e9f7dba49146f896337e814ecf615b3f2fbbcb58d12404742a120466798
|
||||
SHA512 (domoticz-2020.2.tar.gz) = 8ed13f4a00e701ace7acfc90e48bd41a842495d82286646a3c2edfab94809ea320ec22ef421cb0768dd9d9ee19117d31191a1cf89afec09ac7ec1b3aff669d95
|
||||
|
|
Loading…
Reference in New Issue