From 3a6445073ac6b2fe4c59ae5ee4e8dd48c5520893 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Tue, 12 Nov 2024 09:27:35 +0800
Subject: [PATCH] move mosquitto_dynamic_security into main package

(cherry picked from commit e3d726cd91a74158ddef5907907c2b07bf9459c9)
---
 mosquitto.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mosquitto.spec b/mosquitto.spec
index bdf1a47..7eb6f68 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,6 +1,6 @@
 Name:                mosquitto
 Version:             2.0.20
-Release:             1
+Release:             2
 Summary:             Open Source MQTT v3.1/v3.1.1 Broker
 License:             EPL-1.0
 URL:                 https://mosquitto.org/
@@ -12,9 +12,8 @@ BuildRequires:       systemd-devel cjson-devel
 BuildRequires:       cmake libxslt
 Provides:            bundled(uthash)
 Requires(pre):       shadow-utils
-Requires(post):      systemd
-Requires(preun):     systemd
-Requires(postun):    systemd
+Conflicts:           mosquitto-devel < 2.0.20-2
+%{?systemd_requires}
 %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
@@ -49,8 +48,6 @@ DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m 0644 service/systemd/%{name}.service.notify %{buildroot}%{_unitdir}/%{name}.service
 
-%check
-
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
@@ -60,14 +57,12 @@ exit 0
 
 %post
 %systemd_post %{name}.service
-/sbin/ldconfig
 
 %preun
 %systemd_preun %{name}.service
 
 %postun
 %systemd_postun_with_restart %{name}.service
-/sbin/ldconfig
 
 %files
 %license LICENSE.txt
@@ -75,6 +70,7 @@ exit 0
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
+%{_libdir}/mosquitto_dynamic_security.so
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config%{_sysconfdir}/%{name}/*.example
@@ -84,11 +80,14 @@ exit 0
 
 %files devel
 %{_includedir}/*.h
-%{_libdir}/*.so
+%{_libdir}/libmosquitto*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Tue Nov 12 2024 Funda Wang <fundawang@yeah.net> - 2.0.20-2
+- move mosquitto_dynamic_security into main package
+
 * Mon Nov 04 2024 yaoxin <yao_xin001@hoperun.com> - 2.0.20-1
 - Update to 2.0.20
   * Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers". Closes #3128.
-- 
Gitee