mosquitto update to 1.6.3

Signed-off-by: msgqueuebuilder_pel7ppc64bebuilder0 <msgqueuebuilder@powerel.org>

SPECS/mosquitto.spec

@@ -1,25 +1,24 @@
 Name:           mosquitto
-Version:        1.5
+Version:        1.6.3
 Release:        1%{?dist}
 Summary:        An Open Source MQTT v3.1/v3.1.1 Broker
-
 License:        BSD
 URL:            http://mosquitto.org/
 Source0:        http://mosquitto.org/files/source/%{name}-%{version}.tar.gz
-
-BuildRequires:  openssl-devel
-BuildRequires:  tcp_wrappers-libs
-BuildRequires:  systemd
-BuildRequires:  uthash-devel
 BuildRequires:  c-ares-devel
+BuildRequires:  gcc-c++
 BuildRequires:  libuuid-devel
 BuildRequires:  libwebsockets-devel
-
+BuildRequires:  openssl-devel
+BuildRequires:  systemd-devel
+BuildRequires:  tcp_wrappers-libs
+BuildRequires:  uthash-devel
 Requires(pre):  shadow-utils
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
+
 %description
 Mosquitto is an open source message broker that implements the MQ Telemetry
 Transport protocol version 3.1 and 3.1.1 MQTT provides a lightweight method
@@ -28,55 +27,40 @@ suitable for "machine to machine" messaging such as with low power sensors
 or mobile devices such as phones, embedded computers or micro-controllers 
 like the Arduino.
 
+
 %package devel
 Requires:     %{name}%{?_isa} = %{version}-%{release}
 Summary:      Development files for %{name}
-
 %description devel
 Development headers and libraries for %{name}
 
+
 %prep
 %setup -q
-# Remove bundled uthash.h
-rm -r src/uthash.h
 # Set the install prefix to /usr
-sed -i "s|prefix=/usr/local|prefix=/usr|" config.mk
+sed -i "s|prefix?=/usr/local|prefix?=/usr|" config.mk
 # Don't strip binaries on install: rpmbuild will take care of it
 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 WITH_BUNDLED_DEPS=no
+
 
 %install
-%if "%{_lib}" == "lib64"
 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
 #make test
 
+
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
@@ -84,20 +68,24 @@ getent passwd %{name} >/dev/null || \
     -c "Mosquitto Broker" %{name}
 exit 0
 
+
 %post
 %systemd_post %{name}.service
 /sbin/ldconfig
 
+
 %preun
 %systemd_preun %{name}.service
 
+
 %postun
 %systemd_postun_with_restart %{name}.service
 /sbin/ldconfig
 
+
 %files
-%doc ChangeLog.txt CONTRIBUTING.md readme.md
 %license LICENSE.txt 
+%doc ChangeLog.txt CONTRIBUTING.md readme.md
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
@@ -110,12 +98,64 @@ exit 0
 %{_mandir}/man7/*.7.*
 %{_mandir}/man8/*.8.*
 
+
 %files devel
 %{_includedir}/*.h
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*.3.*
 
+
 %changelog
+* Wed Mar  6 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.8-1
+- New upstream version 1.5.8
+
+* Sat Feb 16 2019 Fabian Affolter <mail@fabian-affolter.ch> - 1.5.7-1
+- Update to new upstream version 1.5.7
+
+* Sat Feb  9 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.6-1
+- 1.5.6 release
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan  7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.5-2
+- Rebuild for libwebsockets 3.x
+
+* Tue Dec 18 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.5.5-1
+- Update to new upstream version 1.5.5 (rhbz#1660413, rhbz#1660414)
+
+* Fri Nov 09 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.5.4-2
+- Update to new upstream version 1.5.4
+
+* Sun Oct 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.3-1
+- 1.5.3 release
+
+* Thu Sep 20 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.5.2-2
+- Use WITH_BUNDLED_DEPS=no
+
+* Thu Sep 20 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.5.2-1
+- Update to new upstream version 1.5.2
+
+* Mon Aug 20 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.5.1-1
+- 1.5.1 release
+
+* Fri Jul 20 2018 John W. Linville <linville@redhat.com> - 1.5-5
+- Add previously unnecessary BuildRequires for gcc-c++
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat May 26 2018 Rich Mattes <richmattes@gmail.com> - 1.5-3
+- Add network-online.target and documentation to unitfile
+
+* 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)
+
 * Sat May 05 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.4.15-2
 - Update systemd unit file (rhbz#1564733)