Accepting request 901199 from home:gmbr3:Active

- Add now working CONFIG parameter to sysusers generator
- UsrMerge changes

OBS-URL: https://build.opensuse.org/request/show/901199
OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=96
This commit is contained in:
Marcus Meissner 2021-08-09 09:19:45 +00:00 committed by Git OBS Bridge
parent 3a69582139
commit 03eb056769
2 changed files with 21 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 21 15:44:17 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
- Add now working CONFIG parameter to sysusers generator
- UsrMerge changes
-------------------------------------------------------------------
Mon May 17 07:06:12 UTC 2021 - Petr Vorel <pvorel@suse.cz>

View File

@ -63,8 +63,6 @@ autoreconf -fiv
export CFLAGS="%{optflags} -fpie"
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%configure \
--bindir=/bin \
--sbindir=/sbin \
--enable-libwrap \
--enable-warmstarts \
--enable-debug \
@ -74,7 +72,7 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
--with-nss-modules="files usrfiles"
make %{?_smp_mflags}
%sysusers_generate_pre %{SOURCE5} rpc
%sysusers_generate_pre %{SOURCE5} rpc rpc-user.conf
%install
%make_install
@ -86,8 +84,15 @@ mkdir -p %{buildroot}%{_sysusersdir}
install -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
# create symlink for rcrpcbind
mkdir -p %{buildroot}/%{_sbindir}
ln -s service %{buildroot}/%{_sbindir}/rc%{name}
ln -s /bin/rpcinfo %{buildroot}/sbin/rpcinfo
ln -s service %{buildroot}%{_sbindir}/rc%{name}
ln -s %{_bindir}/rpcinfo %{buildroot}%{_sbindir}/rpcinfo
%if !0%{?usrmerged}
mkdir %{buildroot}/sbin
mkdir %{buildroot}/bin
ln -s %{_bindir}/rpcinfo %{buildroot}/sbin/rpcinfo
ln -s %{_bindir}/rpcinfo %{buildroot}/bin/rpcinfo
ln -s %{_sbindir}/%{name} %{buildroot}/sbin/%{name}
%endif
%pre -f rpc.pre
%service_add_pre %{name}.service %{name}.socket
@ -105,9 +110,14 @@ ln -s /bin/rpcinfo %{buildroot}/sbin/rpcinfo
%files
%license COPYING
%doc AUTHORS README
%if !0%{?usrmerged}
/sbin/%{name}
/bin/rpcinfo
/sbin/rpcinfo
%endif
%{_sbindir}/%{name}
%{_bindir}/rpcinfo
%{_sbindir}/rpcinfo
%{_sbindir}/rc%{name}
%{_mandir}/*/*
%{_fillupdir}/sysconfig.%{name}