[packages/domoticz] - update deps and fonts

arekm arekm at pld-linux.org
Sun Jan 21 19:54:34 CET 2018


commit 06cb1c68089503dfd75c8b32aab29ac09e132e28
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Jan 21 19:54:28 2018 +0100

    - update deps and fonts

 domoticz.spec | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/domoticz.spec b/domoticz.spec
index 0ef9be1..3eaf4fc 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -34,15 +34,12 @@ BuildRequires:	sqlite-devel
 BuildRequires:	systemd-devel
 BuildRequires:	tinyxpath-devel
 BuildRequires:	zlib-devel
-
-Requires(pre):	shadow-utils
+Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  /usr/sbin/useradd
 Requires(post):	systemd
 Requires(postun):	systemd
 Requires(preun):	systemd
-
-Requires:	google-droid-sans-fonts
-Suggests:	system-python-libs >= 3.4
-
+Requires:       fonts-TTF-Google-Droid
 Provides:	bundled(js-ace)
 Provides:	bundled(js-angular-ui-bootstrap) = 0.13.4
 Provides:	bundled(js-angularamd) = 0.2.1
@@ -131,13 +128,13 @@ install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/
 
 # Unbundle DroidSans.ttf
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts/DroidSans.ttf
-ln -s %{_fontdir}/google-droid/DroidSans.ttf \
+ln -s /usr/share/fonts/TTF/DroidSans.ttf \
       $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-light/fonts/DroidSans.ttf
-ln -s %{_fontdir}/google-droid/DroidSans.ttf \
+ln -s /usr/share/fonts/TTF/DroidSans.ttf \
       $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-light/fonts/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/DroidSans.ttf
-ln -s %{_fontdir}/google-droid/DroidSans.ttf \
+ln -s /usr/share/fonts/TTF/DroidSans.ttf \
       $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/
 
 # OpenZWave Control Panel temp file
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/domoticz.git/commitdiff/06cb1c68089503dfd75c8b32aab29ac09e132e28



More information about the pld-cvs-commit mailing list