From bc8c7720f5c5c73bb98c3f72c65e8028c4bfba94 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sat, 26 May 2018 14:44:25 -0400
Subject: [PATCH] Use upstream systemd service and enable systemd notification
 support   (rhbz#1410654)

---
 mosquitto.spec | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/mosquitto.spec b/mosquitto.spec
index 7b3e348..83cf457 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,6 +1,6 @@
 Name:           mosquitto
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An Open Source MQTT v3.1/v3.1.1 Broker
 
 License:        BSD
@@ -9,7 +9,7 @@ Source0:        http://mosquitto.org/files/source/%{name}-%{version}.tar.gz
 
 BuildRequires:  openssl-devel
 BuildRequires:  tcp_wrappers-libs
-BuildRequires:  systemd
+BuildRequires:  systemd-devel
 BuildRequires:  uthash-devel
 BuildRequires:  c-ares-devel
 BuildRequires:  libuuid-devel
@@ -47,7 +47,7 @@ sed -i "s|(INSTALL) -s|(INSTALL)|g" lib/Makefile src/Makefile client/Makefile
 %build
 export CFLAGS="%{optflags}"
 export LDFLAGS="%{optflags} %{__global_ldflags} -Wl,--as-needed"
-make all %{?_smp_mflags} WITH_WEBSOCKETS=yes
+make all %{?_smp_mflags} WITH_WEBSOCKETS=yes WITH_SYSTEMD=yes
 
 %install
 %if "%{_lib}" == "lib64"
@@ -55,23 +55,8 @@ export LIB_SUFFIX=64
 %endif
 %make_install
 
-cat > mosquitto.service << FOE
-[Unit]
-Description=Mosquitto MQTT v3.1/v3.1.1 Broker
-Documentation=man:mosquitto.conf(5) man:mosquitto(8)
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
-User=mosquitto
-
-[Install]
-WantedBy=multi-user.target
-FOE
-
 mkdir -p %{buildroot}%{_unitdir}
-install -p -m 0644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service
+install -p -m 0644 service/systemd/%{name}.service.notify %{buildroot}%{_unitdir}/%{name}.service
 mv %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf.example %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
 %check
@@ -116,6 +101,10 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Sat May 26 2018 Rich Mattes <richmattes@gmail.com> - 1.5-2
+- Use upstream systemd service and enable systemd notification support
+  (rhbz#1410654)
+
 * Sun May 20 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.5-2
 - Update to new upstream version 1.5 (rhbz#1580115)