From 5f7b0719d141c0f154c0ea4fd3d8210c9f0acad3 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Oct 09 2019 21:42:06 +0000 Subject: Update to git checkout 4.11352-0.git20191006 --- diff --git a/.gitignore b/.gitignore index 3fdc8e9..ec1ab55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/domoticz-4.11250.tar.gz +/domoticz-4.11352.tar.gz diff --git a/domoticz-appversion b/domoticz-appversion index 7529966..e238dd0 100644 --- a/domoticz-appversion +++ b/domoticz-appversion @@ -1,3 +1,3 @@ -#define APPVERSION 11250 -#define APPHASH "4bcca19" -#define APPDATE 1567146300 +#define APPVERSION 11352 +#define APPHASH "5298095" +#define APPDATE 1570338000 diff --git a/domoticz-version.patch b/domoticz-version.patch index b87fb34..e1e09f5 100644 --- a/domoticz-version.patch +++ b/domoticz-version.patch @@ -4,6 +4,6 @@ -#define APPVERSION 9700 -#define APPHASH "b97777b" -#define APPDATE 1478691222 -+#define APPVERSION 10717 -+#define APPHASH "649306c" -+#define APPDATE 1557423720 ++#define APPVERSION 11352 ++#define APPHASH "5298095" ++#define APPDATE 1570338000 diff --git a/domoticz.spec b/domoticz.spec index af21b05..91f0fb6 100644 --- a/domoticz.spec +++ b/domoticz.spec @@ -1,6 +1,6 @@ Name: domoticz -Version: 4.11250 -Release: 0.git20190831.1%{?dist} +Version: 4.11352 +Release: 0.git20191006.1%{?dist} Summary: Open source Home Automation System License: GPLv3+ and ASL 2.0 and Boost and BSD and MIT @@ -10,7 +10,7 @@ Source1: %{name}.service Source2: %{name}.conf Source3: %{name}-appversion -# Source says its version 3.5876, but it's really 4.9700 +# Manually update version reported inside app Patch1: %{name}-version.patch # Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759) Patch2: %{name}-tinyxpath.patch @@ -134,8 +134,10 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}/ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} -# create backups/database/plugins/ssl cert directory -mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/{backups,plugins} +# create backups/database/plugins/scripts/ssl cert directory +mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/{backups,plugins,scripts} +mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/{dzVents,lua,lua_parsers,python,templates} +mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/dzVents/{data,generated_scripts,scripts} # Disable the app's self-update script chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/updatedomo @@ -151,11 +153,36 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/DroidSans ln -s %{_fontdir}/google-droid/DroidSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/ -# Link default plugins to userdata directory -ln -s %{_sharedstatedir}/%{name}/plugins/AwoxSMP \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/AwoxSMP -ln -s %{_sharedstatedir}/%{name}/plugins/examples \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/examples +# Link default plugins and scripts to userdata directory + +ln -s %{_datadir}/%{name}/scripts/dzVents/data/README.md \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/dzVents/data/README.md +ln -s %{_datadir}/%{name}/scripts/dzVents/generated_scripts/README.md \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/dzVents/generated_scripts/README.md +ln -s %{_datadir}/%{name}/scripts/dzVents/scripts/README.md \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/dzVents/scripts/README.md +ln -s %{_datadir}/%{name}/scripts/templates/All.{dzVents,Lua,Python} \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Bare.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Device.{dzVents,Lua} \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/global_data.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Group.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/HTTPRequest.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Scene.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Security.{dzVents,Lua} \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Time.Lua \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/Timer.dzVents \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ +ln -s %{_datadir}/%{name}/scripts/templates/UserVariable.{dzVents,Lua} \ + $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/scripts/templates/ # Byte compile the default plugin %py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/plugins/AwoxSMP @@ -193,7 +220,10 @@ usermod -G domoticz,dialout domoticz %changelog -* Sat Aug 31 2019 Michael Cronenworth - 4.10718-0.git20190831.1 +* Wed Oct 09 2019 Michael Cronenworth - 4.11352-0.git20191006.1 +- Update git checkout and fix scripts directories (RHBZ#1759558) + +* Sat Aug 31 2019 Michael Cronenworth - 4.11250-0.git20190831.1 - Fix app version to match upstream versioning - Fix default userdata location so the app can write to it diff --git a/sources b/sources index afb78ae..c25fc9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (domoticz-4.11250.tar.gz) = 3f969374fe16bf4d241f6f47967bf4f90be91c9f4f376285cc834c0a31c02952cb6fc9393a361d4a2206471ef9677a4ae95bf92ab942db2d1468b72e4e0ac5c7 +SHA512 (domoticz-4.11352.tar.gz) = 9b4c1153679e1955d89b5fbd43ce7c4a3d34fa96962a39d95ee3c9bd77544768a34afefe6e16314da436c71b83e53cc2dfad043ecad6885023eb9a8da9ced854