From 3cd6b8632975f0c348349534e692ad4965bd3dd0d970750c94fc27b2de6d15a9 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Thu, 7 Sep 2017 17:35:53 +0000 Subject: [PATCH] Accepting request 522008 from home:jengelh:branches:network:messaging:mqtt - Fix incorrect RPM groups. - Remove repeated license declaration from description. Trim package descriptions for size. - Errors from user creation must not be ignored. OBS-URL: https://build.opensuse.org/request/show/522008 OBS-URL: https://build.opensuse.org/package/show/network:messaging:mqtt/mosquitto?expand=0&rev=5 --- mosquitto.changes | 8 ++++++++ mosquitto.spec | 51 +++++++++++++++++++---------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/mosquitto.changes b/mosquitto.changes index 049e81d..7a3670b 100644 --- a/mosquitto.changes +++ b/mosquitto.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 7 12:13:21 UTC 2017 - jengelh@inai.de + +- Fix incorrect RPM groups. +- Remove repeated license declaration from description. + Trim package descriptions for size. +- Errors from user creation must not be ignored. + ------------------------------------------------------------------- Fri Jul 7 18:33:53 UTC 2017 - antoine.belvire@opensuse.org diff --git a/mosquitto.spec b/mosquitto.spec index 6931bfb..82280ef 100644 --- a/mosquitto.spec +++ b/mosquitto.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} > 1230 || 0%{?rhel_version} > 600 || 0%{?centos_version} > 600 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without systemd %else @@ -25,10 +26,10 @@ Name: mosquitto Version: 1.4.13 Release: 0 +Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 -Summary: An Open Source MQTT v3.1/v3.1.1 Broker +Group: Productivity/Networking/Other Url: http://mosquitto.org/ -Group: System/Daemons Source: http://mosquitto.org/files/source/mosquitto-%{version}.tar.gz Source1: mosquitto.service Source2: mosquitto.fw @@ -52,6 +53,7 @@ BuildRequires: tcpd-devel BuildRequires: pkgconfig(systemd) %{?systemd_requires} %endif +Requires(pre): shadow %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services %define home /var/lib/%{name} @@ -59,7 +61,7 @@ BuildRequires: pkgconfig(systemd) %define cpp_lib libmosquittopp1 %description -Mosquitto is an open source (BSD licensed) message broker that implements the +Mosquitto is a message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low @@ -69,63 +71,52 @@ that Andy Stanford-Clark (one of the originators of MQTT) has done in home monitoring and automation with his twittering house and twittering ferry. %package -n %{c_lib} -Group: Development/Libraries/C and C++ Summary: Shared C Library for %{name} +Group: Development/Libraries/C and C++ + %description -n %{c_lib} -Mosquitto is an open source (BSD licensed) message broker that implements the +Mosquitto is a message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. -This makes it suitable for "machine to machine" messaging such as with low -power sensors or mobile devices such as phones, embedded computers or -microcontrollers like the Arduino. A good example of this is all of the work -that Andy Stanford-Clark (one of the originators of MQTT) has done in home -monitoring and automation with his twittering house and twittering ferry. This package holds the shared C library. %package -n %{cpp_lib} -Group: Development/Libraries/C and C++ Summary: Shared C++ Library for %{name} +Group: Development/Libraries/C and C++ + %description -n %{cpp_lib} -Mosquitto is an open source (BSD licensed) message broker that implements the +Mosquitto is a message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. -This makes it suitable for "machine to machine" messaging such as with low -power sensors or mobile devices such as phones, embedded computers or -microcontrollers like the Arduino. A good example of this is all of the work -that Andy Stanford-Clark (one of the originators of MQTT) has done in home -monitoring and automation with his twittering house and twittering ferry. This package holds the shared C++ library. %package devel -Group: Development/Libraries/C and C++ Requires: %{c_lib} = %{version} Requires: %{cpp_lib} = %{version} Provides: libmosquitto-devel = %{version}-%{release} Provides: libmosquittopp-devel = %{version}-%{release} -Summary: Development files %{name} +Summary: Development files for %{name} +Group: Development/Libraries/C and C++ + %description devel -Mosquitto is an open source (BSD licensed) message broker that implements the +Mosquitto is a message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. -This makes it suitable for "machine to machine" messaging such as with low -power sensors or mobile devices such as phones, embedded computers or -microcontrollers like the Arduino. A good example of this is all of the work -that Andy Stanford-Clark (one of the originators of MQTT) has done in home -monitoring and automation with his twittering house and twittering ferry. This package holds the development files. %package clients -Group: System/Daemons Summary: Client for Mosquitto +Group: Productivity/Networking/Other + %description clients -Mosquitto is an open source (BSD licensed) message broker that implements the +Mosquitto is a message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low @@ -140,7 +131,7 @@ Client for Mosquitto. %setup -q %patch0 -p1 %patch1 -find misc -type f -print0 | xargs -r0 chmod a-x +find misc -type f -exec chmod a-x "{}" "+" %build %cmake \ @@ -170,8 +161,8 @@ install -D -m 644 %{S:5} %{buildroot}/etc/mosquitto/ca_certificates/README install -D -m 644 %{S:6} %{buildroot}/etc/mosquitto/certs/README %pre -/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "%{name}" -d %{home} %{name} >/dev/null 2>&1 || : +getent group %{name} || /usr/sbin/groupadd -r %{name} +getent passwd %{name} || /usr/sbin/useradd -g %{name} -s /bin/false -r -c "%{name}" -d %{home} %{name} # START BIG SYSTEMD %if %{with systemd} %if 0%{?suse_version}