From 22e81854103c9a32e96d17991c9c9641798899b783fb8968f549538edde9d463 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Wed, 15 Nov 2023 14:20:46 +0000
Subject: [PATCH] Accepting request 1117613 from home:kukuk:branches:network

- SLP got dropped, remove config (bsc#1214884)

OBS-URL: https://build.opensuse.org/request/show/1117613
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=163
---
 dnsmasq.changes |  5 +++++
 dnsmasq.reg     | 12 ------------
 dnsmasq.spec    |  6 +-----
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 dnsmasq.reg

diff --git a/dnsmasq.changes b/dnsmasq.changes
index 10a13e6..50d6f0e 100644
--- a/dnsmasq.changes
+++ b/dnsmasq.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 13 08:48:49 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
+
+- SLP got dropped, remove config (bsc#1214884)
+
 -------------------------------------------------------------------
 Sat May 13 16:48:15 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
 
diff --git a/dnsmasq.reg b/dnsmasq.reg
deleted file mode 100644
index d070172..0000000
--- a/dnsmasq.reg
+++ /dev/null
@@ -1,12 +0,0 @@
-#############################################################################
-#
-# OpenSLP registration file
-#
-# register domain name service (DNS) daemon
-#
-#############################################################################
-
-service:domain://$HOSTNAME:53,en,65535
-watch-port-udp=53
-description=Domain Name Service
-
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 54a960c..fc23acf 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -31,7 +31,6 @@ URL:            https://thekelleys.org.uk/dnsmasq/
 Source0:        https://thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz
 Source1:        https://thekelleys.org.uk/%{name}/%{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
-Source3:        dnsmasq.reg
 Source4:        dnsmasq.service
 Source5:        rc.dnsmasq-suse
 Source6:        system-user-dnsmasq.conf
@@ -167,9 +166,8 @@ fi
 
 %install
 make install-i18n DESTDIR=%{buildroot} PREFIX=%{_prefix} AWK=gawk COPTS=%{_copts}
-install -d -m 755 %{buildroot}/%{_sysconfdir}/slp.reg.d
+install -d -m 755 %{buildroot}/%{_sysconfdir}/
 install -m 644 dnsmasq.conf.example %{buildroot}/%{_sysconfdir}/dnsmasq.conf
-install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/slp.reg.d/
 install -d 755 %{buildroot}%{_datadir}/dbus-1/system.d/
 install -m 644 dbus/dnsmasq.conf %{buildroot}%{_datadir}/dbus-1/system.d/dnsmasq.conf
 install -D -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/dnsmasq.service
@@ -207,8 +205,6 @@ rm -rf contrib/MacOSX-launchd
 %config(noreplace) %{_sysconfdir}/dnsmasq.conf
 %{_sbindir}/dnsmasq
 %{_sbindir}/rcdnsmasq
-%dir %{_sysconfdir}/slp.reg.d/
-%config %attr(0644,root,root) /%{_sysconfdir}/slp.reg.d/dnsmasq.reg
 %{_mandir}/man8/dnsmasq.8%{?ext_man}
 %{_datadir}/dbus-1/system.d/dnsmasq.conf
 %{_unitdir}/dnsmasq.service