X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=domoticz.spec;h=92fa9f48d20fcb5f01b1ecb996248da5099b4d14;hb=9a71e0cb9f28f5f904860c2ad2d046032e33f5bd;hp=1c5e3660c2905b61a8bb51547ed1d3b6f49a4593;hpb=2fd2c1d45a7a0e0ad3a49b59014f1303200c5799;p=packages%2Fdomoticz.git

diff --git a/domoticz.spec b/domoticz.spec
index 1c5e366..92fa9f4 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -1,32 +1,30 @@
 Summary:	Open source Home Automation System
 Name:		domoticz
-Version:	2020.2
-Release:	3
+Version:	2021.1
+Release:	1
 License:	GPLv3+ and ASL 2.0 and Boost and BSD and MIT
 Group:		Base
 URL:		http://www.domoticz.com
 Source0:	https://github.com/domoticz/domoticz/archive/%{version}.tar.gz
-# Source0-md5:	fd383a13d13d0976c72f332d6db1d24e
+# Source0-md5:	28349806fc3ddb0514ea7d9255ceecd0
 Source1:	%{name}.service
 Source2:	%{name}.conf
 # Use system tinyxpath (https://github.com/domoticz/domoticz/pull/1759)
 Patch0:		%{name}-tinyxpath.patch
-# Use system openzwave includes
-Patch1:		%{name}-openzwave.patch
 # Fix python detection (https://github.com/domoticz/domoticz/pull/1749)
-Patch2:		%{name}-python.patch
-Patch3:		no-git.patch
-Patch4:		boost-1.73.patch
-Patch5:		%{name}-gpio.patch
-Patch6:		python3.9.patch
+Patch1:		%{name}-python.patch
+Patch2:		no-git.patch
+Patch3:		%{name}-gpio.patch
+Patch4:		%{name}-no_updates.patch
 BuildRequires:	boost-devel >= 1.66.0
 BuildRequires:	cereal-devel
 BuildRequires:	cmake >= 3.16.0
 BuildRequires:	curl-devel
 BuildRequires:	jsoncpp-devel
+BuildRequires:	libfmt-devel
 BuildRequires:	libmosquitto-devel
 BuildRequires:	libopenzwave-devel >= 1.5.0
-BuildRequires:	libstdc++-devel >= 6:4.8.1
+BuildRequires:	libstdc++-devel >= 6:4.9
 BuildRequires:	libusb-compat-devel
 BuildRequires:	linux-libc-headers
 BuildRequires:	lua53-devel
@@ -44,7 +42,9 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	fonts-TTF-Google-Droid
+Requires:	fonts-TTF-OpenSans
 Requires:	libopenzwave >= 1.5.0
+Requires:	setup >= 2.10.1
 Provides:	group(domoticz)
 Provides:	user(domoticz)
 
@@ -61,8 +61,6 @@ and much more. Notifications/Alerts can be sent to any mobile device
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 APPVERSION="%{version}"
 echo "#define APPVERSION ${APPVERSION##*.}" > appversion.h
@@ -76,6 +74,7 @@ echo "#define APPDATE ${APPDATE}" >> appversion.h
 install -d build && cd build
 %cmake \
 	-DUSE_BUILTIN_JSONCPP=NO \
+	-DUSE_BUILTIN_LIBFMT=NO \
 	-DUSE_BUILTIN_MINIZIP=NO \
 	-DUSE_BUILTIN_MQTT=NO \
 	-DUSE_BUILTIN_SQLITE=NO \
@@ -108,13 +107,19 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
 # Unbundle DroidSans.ttf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element{al,-light,-dark}/fonts/DroidSans.ttf
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element{al,-light,-dark}/fonts/{Droid,Open}Sans.ttf
 ln -s %{_fontsdir}/TTF/DroidSans.ttf \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts
+ln -s %{_fontsdir}/TTF/OpenSans-Regular.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts/OpenSans.ttf
 ln -s %{_fontsdir}/TTF/DroidSans.ttf \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-light/fonts
+ln -s %{_fontsdir}/TTF/OpenSans-Regular.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-light/fonts/OpenSans.ttf
 ln -s %{_fontsdir}/TTF/DroidSans.ttf \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts
+ln -s %{_fontsdir}/TTF/OpenSans-Regular.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/OpenSans.ttf
 
 # OpenZWave Control Panel temp file
 ln -s %{_sharedstatedir}/%{name}/ozwcp.poll.XXXXXX.xml \
@@ -125,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 342 domoticz
-%useradd -u 342 -r -d %{_datadir} -s /bin/false -c "Domoticz Home Automation Server" -G dialout -g domoticz domoticz
+%useradd -u 342 -r -d %{_datadir} -s /bin/false -c "Domoticz Home Automation Server" -G dialout,i2c -g domoticz domoticz
 
 %post
 %systemd_post %{name}.service