rpms/domoticz
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync app version and change default user directory

Browse Source
This commit is contained in:
Michael Cronenworth 2019-09-04 19:33:09 -05:00
parent 3d0a1dec50
commit 51ef934ee4
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
domoticz-appversion
View File

@ -1,3 +1,3 @@
#define APPVERSION 10718
#define APPHASH "649306c"
#define APPDATE 1557423720
#define APPVERSION 11250
#define APPHASH "4bcca19"
#define APPDATE 1567146300

2
domoticz.conf
View File

@ -7,7 +7,7 @@ SSLOPTIONS=""
SSLDHPARAM=""
WWW_ROOT="/usr/share/domoticz/www"
DBASE="/var/lib/domoticz/domoticz.db"
USERDATA="/usr/share/domoticz/"
USERDATA="/var/lib/domoticz/"
LOG="/var/log/domoticz.log"
LOGLEVEL="1"

21
domoticz.spec
View File

@ -1,5 +1,5 @@
Name: domoticz
Version: 4.10718
Version: 4.11250
Release: 0.git20190831.1%{?dist}
Summary: Open source Home Automation System
@ -134,8 +134,8 @@ 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/ssl cert directory
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/backups
# create backups/database/plugins/ssl cert directory
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/{backups,plugins}
# Disable the app's self-update script
chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/updatedomo
@ -151,12 +151,11 @@ 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/
# Automatic backup directory
ln -s %{_sharedstatedir}/%{name}/backups \
$RPM_BUILD_ROOT%{_datadir}/%{name}/backups
# OpenZWave Control Panel temp file
ln -s %{_sharedstatedir}/%{name}/ozwcp.poll.XXXXXX.xml \
$RPM_BUILD_ROOT%{_datadir}/%{name}/ozwcp.poll.XXXXXX.xml
# 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
# Byte compile the default plugin
%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/plugins/AwoxSMP
@ -194,6 +193,10 @@ usermod -G domoticz,dialout domoticz
%changelog
* Sat Aug 31 2019 Michael Cronenworth <mike@cchtml.com> - 4.10718-0.git20190831.1
- Fix app version to match upstream versioning
- Fix default userdata location so the app can write to it
* Sat Aug 31 2019 Michael Cronenworth <mike@cchtml.com> - 4.10718-0.git20190831.1
- Version update to current master git checkout
- Compile against OpenZWave 1.6