diff --git a/.gitignore b/.gitignore index 1064cf7..d284373 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,3 @@ /wsdd-0.6.3.tar.gz /wsdd-0.6.4.tar.gz /wsdd-0.7.0.tar.gz -/wsdd-0.7.1.tar.gz -/wsdd-0.8.tar.gz diff --git a/Modify-systemd-service-for-Fedora.patch b/Modify-systemd-service-for-Fedora.patch deleted file mode 100644 index 763a583..0000000 --- a/Modify-systemd-service-for-Fedora.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 716ab555a99350e60a11066f912df65a0bb01c35 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Wed, 17 Apr 2024 12:50:08 +0200 -Subject: [PATCH] Modify systemd service for Fedora - -Those changes are needed to honor Fedora package guidelines and for -backward compatibility. ---- - etc/systemd/wsdd.defaults | 2 +- - etc/systemd/wsdd.service | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/etc/systemd/wsdd.defaults b/etc/systemd/wsdd.defaults -index 3c8373e..518fe6f 100644 ---- a/etc/systemd/wsdd.defaults -+++ b/etc/systemd/wsdd.defaults -@@ -2,4 +2,4 @@ - # Use, e.g., "-i eth0" to restrict operations to a specific interface - # Refer to the wsdd(8) man page for details - --WSDD_PARAMS="" -+OPTIONS="" -diff --git a/etc/systemd/wsdd.service b/etc/systemd/wsdd.service -index eea4670..a6d20c6 100644 ---- a/etc/systemd/wsdd.service -+++ b/etc/systemd/wsdd.service -@@ -7,15 +7,15 @@ Wants=network-online.target - ; It makes sense to have Samba running when wsdd starts, but is not required. - ; Thus, the next to lines are disabled and use BindsTo only. - ; One may also add any of these services to After for stronger binding. --;BindsTo=smb.service -+BindsTo=smb.service - ;BindsTo=samba.service - - [Service] - Type=simple --EnvironmentFile=/etc/default/wsdd -+EnvironmentFile=-/etc/sysconfig/wsdd - ; The service is put into an empty runtime directory chroot, - ; i.e. the runtime directory which usually resides under /run --ExecStart=/usr/bin/wsdd --shortlog --chroot=/run/wsdd $WSDD_PARAMS -+ExecStart=/usr/bin/wsdd --shortlog --chroot=/run/wsdd $OPTIONS - DynamicUser=yes - User=wsdd - Group=wsdd --- -2.44.0 - diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 3334bd2..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = fedora epel diff --git a/sources b/sources index d171d39..1a700ef 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ -SHA512 (wsdd-0.8.tar.gz) = e3e5164f9ebe39c979456169bf1b0c6c4cd974792f08fa4dfab9c313fba88ae1208a8112db09c3655719b4e26bfc2616f844f17d2a245132c2f5b22e978e3c20 +SHA512 (wsdd-0.7.0.tar.gz) = 06926872a63b16526c315dd97e0b7711475c7a4f348db3cb994694256dd01ab099b98b0f6881a7a4fae97b9a8c6784da4b0dc7ec30bb607aa77c824d0687ee76 +SHA512 (wsdd.service) = 2725f5a5396d747a752a6a01671819cf4bed30d27ba497f6fe568cf8b39408d8cd79ee89eefaa03248ad5d6ea69d593347f7dfebeaa667f1c0abff2c8f193fb7 +SHA512 (wsdd.xml) = 36def332798589dde0a5c514f64812f888208e18b8ccd163f1e1ab80fd81838c9b6c900f5e4d1a45ace571b1effa16182ad8116c7bdd836a4c8cf36f49bd863e +SHA512 (wsdd-http.xml) = 6238be4d37eaeb412ce87f67cd6fa19af3a3dea25c1a23537eff6955eaf7bcce399a13d845107b65a3c4bb0bc89d4bf372570742aa5ed0b2f7ecfd0598c1a23e +SHA512 (wsdd.sysconfig) = 12909698de7cd5972e721184dd7dcecf9bc4a25647e4516a7298666957c9b927e033517065c24ea350a9db72b3dc76fba6d260f16c1a5db4fee52daab04e3581 diff --git a/wsdd.spec b/wsdd.spec index b843d1a..5fd870f 100644 --- a/wsdd.spec +++ b/wsdd.spec @@ -1,15 +1,17 @@ Name: wsdd -Version: 0.8 -Release: 7%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Web Services Dynamic Discovery host daemon License: MIT URL: https://github.com/christgau/wsdd Source0: https://github.com/christgau/wsdd/archive/v%{version}/wsdd-%{version}.tar.gz - -Patch: Modify-systemd-service-for-Fedora.patch - +Source1: wsdd.service +Source2: wsdd.xml +Source3: wsdd-http.xml +Source4: wsdd.sysconfig BuildArch: noarch BuildRequires: systemd +Requires(pre): shadow-utils %description @@ -19,25 +21,24 @@ like Windows. %prep -%autosetup -p1 +%autosetup %install -install -pDm644 etc/firewalld/services/wsdd.xml %{buildroot}%{_usr}/lib/firewalld/services/wsdd.xml -install -pDm644 etc/firewalld/services/wsdd-http.xml %{buildroot}%{_usr}/lib/firewalld/services/wsdd-http.xml -install -pDm644 etc/systemd/wsdd.defaults %{buildroot}%{_sysconfdir}/sysconfig/wsdd -install -pDm644 etc/systemd/wsdd.service %{buildroot}%{_unitdir}/wsdd.service -install -pDm644 man/wsdd.8 %{buildroot}%{_mandir}/man8/wsdd.8 +install -pDm644 %{S:1} %{buildroot}%{_unitdir}/wsdd.service +install -pDm644 %{S:2} %{buildroot}%{_usr}/lib/firewalld/services/wsdd.xml +install -pDm644 %{S:3} %{buildroot}%{_usr}/lib/firewalld/services/wsdd-http.xml +install -pDm644 %{S:4} %{buildroot}%{_sysconfdir}/sysconfig/wsdd +install -pDm644 man/wsdd.1 %{buildroot}%{_mandir}/man1/wsdd.1 install -pDm755 src/wsdd.py %{buildroot}%{_bindir}/wsdd -# Create a sysusers.d config file -cat >wsdd.sysusers.conf </dev/null || groupadd -r wsdd +getent passwd wsdd >/dev/null || \ + useradd -r -g wsdd -d / -s /sbin/nologin \ + -c "%{summary}" wsdd +exit 0 %post %systemd_post wsdd.service @@ -54,55 +55,12 @@ install -m0644 -D wsdd.sysusers.conf %{buildroot}%{_sysusersdir}/wsdd.conf %{_usr}/lib/firewalld/services/wsdd-http.xml %config(noreplace) %{_sysconfdir}/sysconfig/wsdd %{_bindir}/wsdd -%{_mandir}/man8/wsdd.8* +%{_mandir}/man1/wsdd.1* %license LICENSE %doc AUTHORS README.md -%{_sysusersdir}/wsdd.conf %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 0.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 0.8-4 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sun Jan 19 2025 Fedora Release Engineering - 0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Apr 17 2024 Ondrej Holy - 0.8.0-1 -- Update to 0.8 - -* Fri Feb 16 2024 Ondrej Holy - 0.7.1-3 -- Fix backward compatibility (#2254986) - -* Sat Jan 27 2024 Fedora Release Engineering - 0.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Oct 06 2023 Ondrej Holy - 0.7.1-1 -- Update to 0.7.1. - -* Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Fri Dec 03 2021 survient@fedoraproject.org - 0.7.0-1 - Latest upstream release.