pool/wsdd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 830478 from home:hgraeber:branches:network

Browse Source 
- Fix use of /usr/lib and /usr/libexec

OBS-URL: https://build.opensuse.org/request/show/830478
OBS-URL: https://build.opensuse.org/package/show/network/wsdd?expand=0&rev=6
This commit is contained in:
Herbert Graeber 2020-08-29 18:06:42 +00:00 committed by Git OBS Bridge
parent abffde5c42
commit 47c93cab1b
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wsdd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Aug 29 13:41:40 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>
- Fix use of /usr/lib and /usr/libexec
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 6 20:09:48 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de> Mon Jul 6 20:09:48 UTC 2020 - Herbert Graeber <herbert@graeber-clan.de>

2
wsdd.service → wsdd.service.in
View File

@ -8,7 +8,7 @@ Type=simple
AmbientCapabilities=CAP_SYS_CHROOT AmbientCapabilities=CAP_SYS_CHROOT
PermissionsStartOnly=true PermissionsStartOnly=true
Environment= WSDD_ARGS=-p Environment= WSDD_ARGS=-p
ExecStartPre=/usr/lib/wsdd/wsdd-init.sh ExecStartPre=@LIBEXECDIR@/wsdd-init.sh
EnvironmentFile=-/run/sysconfig/wsdd EnvironmentFile=-/run/sysconfig/wsdd
ExecStart=/usr/sbin/wsdd --shortlog -c /run/wsdd $WSDD_ARGS ExecStart=/usr/sbin/wsdd --shortlog -c /run/wsdd $WSDD_ARGS
ExecStartPost=/usr/bin/rm /run/sysconfig/wsdd ExecStartPost=/usr/bin/rm /run/sysconfig/wsdd

24
wsdd.spec
View File

@ -25,7 +25,7 @@ Url: https://github.com/christgau/wsdd
BuildArch: noarch BuildArch: noarch
Source: https://github.com/christgau/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz Source: https://github.com/christgau/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
Source1: %{name}-init.sh Source1: %{name}-init.sh
Source2: %{name}.service Source2: %{name}.service.in
Source3: %{name}.xml Source3: %{name}.xml
Source4: sysconfig.%{name} Source4: sysconfig.%{name}
Source5: %{name}.conf Source5: %{name}.conf
@ -53,13 +53,14 @@ for devices running Samba, like NAS or file sharing servers on your local networ
%install %install
install -m 755 -D src/wsdd.py %{buildroot}%{_sbindir}/%{name} install -m 755 -D src/wsdd.py %{buildroot}%{_sbindir}/%{name}
install -m 644 -D man/wsdd.1 %{buildroot}/%{_mandir}/man1/wsdd.1 install -m 644 -D man/wsdd.1 %{buildroot}/%{_mandir}/man1/wsdd.1
install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd/wsdd-init.sh install -m 755 -D %{SOURCE1} %{buildroot}%{_libexecdir}/wsdd-init.sh
install -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/wsdd.service mkdir -p %{buildroot}%{_unitdir}
install -m 644 -D %{SOURCE3} %{buildroot}%{_libexecdir}/firewalld/services/wsdd.xml sed 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} >%{buildroot}%{_unitdir}/wsdd.service
install -m 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/firewalld/services/wsdd.xml
install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd
install -m 755 -d %{buildroot}%{_sbindir} install -m 755 -d %{buildroot}%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d/
install -m 644 %{SOURCE5} %{buildroot}/usr/lib/tmpfiles.d/ install -m 644 %{SOURCE5} %{buildroot}/usr/lib/tmpfiles.d/
mkdir -p %{buildroot}/run/wsdd mkdir -p %{buildroot}/run/wsdd
mkdir -p %{buildroot}/var/lib/wsdd mkdir -p %{buildroot}/var/lib/wsdd
@ -88,12 +89,13 @@ getent passwd wsdd >/dev/null || %{_sbindir}/useradd -r -g wsdd -c "User for wsd
%{_mandir}/man1/wsdd.1.gz %{_mandir}/man1/wsdd.1.gz
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_unitdir}/wsdd.service %{_unitdir}/wsdd.service
%{_libexecdir}/wsdd %dir %{_libexecdir}
%dir /usr/lib/tmpfiles.d %{_libexecdir}/wsdd-init.sh
/usr/lib/tmpfiles.d/wsdd.conf %dir %{_prefix}/lib/tmpfiles.d
%dir %{_libexecdir}/firewalld %{_prefix}/lib/tmpfiles.d/wsdd.conf
%dir %{_libexecdir}/firewalld/services %dir %{_prefix}/lib/firewalld
%{_libexecdir}/firewalld/services/wsdd.xml %dir %{_prefix}/lib/firewalld/services
%{_prefix}/lib/firewalld/services/wsdd.xml
%{_fillupdir}/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%dir %attr(0755,wsdd,wsdd) %ghost /run/sysconfig %dir %attr(0755,wsdd,wsdd) %ghost /run/sysconfig
%attr(0644,wsdd,wsdd) %ghost /run/sysconfig/wsdd %attr(0644,wsdd,wsdd) %ghost /run/sysconfig/wsdd