From 6582fdff2e50b0bab7f212feaea72277c7f6cb85 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Dec 07 2019 23:18:07 +0000 Subject: Update to the Dec 7, 2019 git checkout --- diff --git a/.gitignore b/.gitignore index ec1ab55..995e0e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/domoticz-4.11352.tar.gz +/domoticz-4.11553.tar.gz diff --git a/domoticz-appversion b/domoticz-appversion index e238dd0..d7fb292 100644 --- a/domoticz-appversion +++ b/domoticz-appversion @@ -1,3 +1,3 @@ -#define APPVERSION 11352 -#define APPHASH "5298095" -#define APPDATE 1570338000 +#define APPVERSION 11553 +#define APPHASH "2a47b97" +#define APPDATE 1575758836 diff --git a/domoticz-python38.patch b/domoticz-python38.patch index f6d508a..db849b8 100644 --- a/domoticz-python38.patch +++ b/domoticz-python38.patch @@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 42082192..f16726f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -727,7 +727,7 @@ +@@ -736,7 +736,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 ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_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 ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) +-target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${MQTT_LIBRARIES} ${LUA_LIBRARIES} ${SQLite_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} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES}) IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin") target_link_libraries(domoticz -lresolv) diff --git a/domoticz-version.patch b/domoticz-version.patch index e1e09f5..77ed4f4 100644 --- a/domoticz-version.patch +++ b/domoticz-version.patch @@ -4,6 +4,6 @@ -#define APPVERSION 9700 -#define APPHASH "b97777b" -#define APPDATE 1478691222 -+#define APPVERSION 11352 -+#define APPHASH "5298095" -+#define APPDATE 1570338000 ++#define APPVERSION 11553 ++#define APPHASH "2a47b97" ++#define APPDATE 1575758836 diff --git a/domoticz.spec b/domoticz.spec index 91f0fb6..044c022 100644 --- a/domoticz.spec +++ b/domoticz.spec @@ -1,11 +1,14 @@ +%global git_short_hash 2a47b97 +%global git_hash 2a47b97c4c0b4e86ebb204674c837ba9f4a692d6 + Name: domoticz -Version: 4.11352 -Release: 0.git20191006.1%{?dist} +Version: 4.11553 +Release: 0.git20191207.1%{?dist} Summary: Open source Home Automation System License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT URL: http://www.domoticz.com -Source0: https://github.com/domoticz/domoticz/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/domoticz/domoticz/archive/%{git_short_hash}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf Source3: %{name}-appversion @@ -84,7 +87,7 @@ any mobile device %prep -%setup -q -n %{name}-development +%setup -q -n %{name}-%{git_hash} #patch1 -p1 -b.version %patch2 -p1 -b.tinyxpath %patch3 -p1 -b.openzwave @@ -220,6 +223,9 @@ usermod -G domoticz,dialout domoticz %changelog +* Sat Dec 07 2019 Michael Cronenworth - 4.11553-0.git20191207.1 +- Update git checkout (RHBZ#1780739) + * Wed Oct 09 2019 Michael Cronenworth - 4.11352-0.git20191006.1 - Update git checkout and fix scripts directories (RHBZ#1759558) diff --git a/sources b/sources index c25fc9b..7ccce14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (domoticz-4.11352.tar.gz) = 9b4c1153679e1955d89b5fbd43ce7c4a3d34fa96962a39d95ee3c9bd77544768a34afefe6e16314da436c71b83e53cc2dfad043ecad6885023eb9a8da9ced854 +SHA512 (domoticz-4.11553.tar.gz) = 2e5196bacd5f94cf47452a5ab899eb166e34537324c207e1e902d00c0e109379c6ded7cacda1c5acffb1824e8ecabb369eced64c38db4d7b8b0e627cd92efb55