X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=domoticz.spec;h=e1bb9caca7e4590463a2b6b2ecf7b7f9a5fb919e;hb=f5d0e49;hp=c2b5af0ee9fb73b7d89964e698ec02a5d570b5f4;hpb=bc226567be013060c4f2dae070942cd07756cb67;p=packages%2Fdomoticz.git

diff --git a/domoticz.spec b/domoticz.spec
index c2b5af0..e1bb9ca 100644
--- a/domoticz.spec
+++ b/domoticz.spec
@@ -17,6 +17,7 @@ Patch1:		%{name}-openzwave.patch
 Patch2:		%{name}-python.patch
 Patch3:		no-git.patch
 Patch4:		boost-1.73.patch
+Patch5:		%{name}-gpio.patch
 BuildRequires:	boost-devel >= 1.66.0
 BuildRequires:	cereal-devel
 BuildRequires:	cmake >= 3.16.0
@@ -33,43 +34,18 @@ BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python3 >= 1:3.4
 BuildRequires:	python3-devel >= 1:3.4
+BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	sqlite3-devel
 BuildRequires:	tinyxml-devel
 BuildRequires:	tinyxpath-devel
 BuildRequires:	zlib-devel
-Requires(pre):  /usr/sbin/groupadd
-Requires(pre):  /usr/sbin/useradd
-Requires(post):	systemd
-Requires(postun):	systemd
-Requires(preun):	systemd
-Requires:       fonts-TTF-Google-Droid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:	fonts-TTF-Google-Droid
 Requires:	libopenzwave >= 1.5.0
-Provides:	bundled(js-ace)
-Provides:	bundled(js-angular-ui-bootstrap) = 0.13.4
-Provides:	bundled(js-angularamd) = 0.2.1
-Provides:	bundled(js-angularjs) = 1.5.8
-Provides:	bundled(js-blockly)
-Provides:	bundled(js-bootbox)
-Provides:	bundled(js-bootstrap) = 3.2.0
-Provides:	bundled(js-colpick)
-Provides:	bundled(js-d3)
-Provides:	bundled(js-datatables-datatools) = 2.2.3
-Provides:	bundled(js-dateformat) = 1.2.3
-Provides:	bundled(js-filesaver) = 0.0-git20140725
-Provides:	bundled(js-highcharts) = 4.2.6
-Provides:	bundled(js-html5shiv) = 3.6.2
-Provides:	bundled(js-i18next) = 1.8.0
-Provides:	bundled(js-ion-sound) = 3.0.6
-Provides:	bundled(js-jquery) = 1.12.0
-Provides:	bundled(js-jquery-noty) = 2.1.0
-Provides:	bundled(js-less) = 1.3.0
-Provides:	bundled(js-ngdraggable)
-Provides:	bundled(js-nggrid)
-Provides:	bundled(js-ozwcp)
-Provides:	bundled(js-require) = 2.1.14
-Provides:	bundled(js-respond) = 1.1.0
-Provides:	bundled(js-wow) = 0.1.9
-Provides:	bundled(js-zeroclipboard) = 1.0.4
+Provides:	group(domoticz)
+Provides:	user(domoticz)
 
 %description
 Domoticz is a Home Automation System that lets you monitor and
@@ -84,6 +60,7 @@ and much more. Notifications/Alerts can be sent to any mobile device
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 APPVERSION="%{version}"
 echo "#define APPVERSION ${APPVERSION##*.}" > appversion.h
@@ -91,13 +68,7 @@ echo '#define APPHASH "%{snap}"' >> appversion.h
 APPDATE=$(date --date="%{date}" "+%s")
 echo "#define APPDATE ${APPDATE}" >> appversion.h
 
-rm -f hardware/openzwave/*.h
-rm -rf hardware/openzwave/aes
-rm -rf hardware/openzwave/command_classes
-rm -rf hardware/openzwave/platform
-rm -rf hardware/openzwave/value_classes
-rm -rf sqlite/
-rm -rf tinyxpath/
+%{__rm} -r extern tinyxpath
 
 %build
 install -d build && cd build
@@ -119,52 +90,40 @@ install -d build && cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} -C build install \
-      DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/sysconfig,%{systemdunitdir},%{_sharedstatedir}/%{name}}
 
 # remove docs, we grab them in files below
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*.txt
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/*.txt
 
 # move binary to standard directory
-install -d $RPM_BUILD_ROOT%{_bindir}/
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}
 
-# install systemd service and config
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-install -d $RPM_BUILD_ROOT%{systemdunitdir}/
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
 
-# create database/ssl cert directory
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/
-
-# Disable the app's self-update script
-
 # Unbundle DroidSans.ttf
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts/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 /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 /usr/share/fonts/TTF/DroidSans.ttf \
-      $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts/
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element{al,-light,-dark}/fonts/DroidSans.ttf
+ln -s %{_fontsdir}/TTF/DroidSans.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/elemental/fonts
+ln -s %{_fontsdir}/TTF/DroidSans.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-light/fonts
+ln -s %{_fontsdir}/TTF/DroidSans.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/www/styles/element-dark/fonts
 
 # OpenZWave Control Panel temp file
 ln -s %{_sharedstatedir}/%{name}/ozwcp.poll.XXXXXX.xml \
-      $RPM_BUILD_ROOT%{_datadir}/%{name}/ozwcp.poll.XXXXXX.xml
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/ozwcp.poll.XXXXXX.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-getent group domoticz >/dev/null || groupadd -r domoticz
-getent passwd domoticz >/dev/null || \
-useradd -r -g domoticz -d %{_datadir}/%{name} -s /sbin/nologin \
--c "Domoticz Home Automation Server" domoticz
-# For OpenZWave USB access (/dev/ttyACM#)
-usermod -G domoticz,dialout domoticz
+%groupadd -g 342 domoticz
+%useradd -u 342 -r -d %{_datadir} -s /bin/false -c "Domoticz Home Automation Server" -G dialout -g domoticz domoticz
 
 %post
 %systemd_post %{name}.service
@@ -173,14 +132,17 @@ usermod -G domoticz,dialout domoticz
 %systemd_preun %{name}.service
 
 %postun
+if [ "$1" = "0" ]; then
+	%userremove mpd
+	%groupremove mpd
+fi
 %systemd_reload
 
 %files
 %defattr(644,root,root,755)
-%doc License.txt
-%doc README.md History.txt
+%doc License.txt README.md History.txt
 %attr(755,root,root) %{_bindir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%{_datadir}/%{name}/
-%attr(755,domoticz,domoticz) %{_sharedstatedir}/%{name}/
+%{_datadir}/%{name}
+%dir %attr(750,domoticz,domoticz) %{_sharedstatedir}/%{name}
 %{systemdunitdir}/%{name}.service