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

Accepting request 1055741 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055741
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=167
This commit is contained in:
Dr. Werner Fink 2023-01-09 10:19:35 +00:00 committed by Git OBS Bridge
parent caccaea2da
commit 35b44908c7
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syslogd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:21:16 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 19 11:57:37 UTC 2022 - Dr. Werner Fink <werner@suse.de> Wed Oct 19 11:57:37 UTC 2022 - Dr. Werner Fink <werner@suse.de>

6
syslogd.spec
View File

@ -177,7 +177,7 @@ install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/
install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/ install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/
ln -s service %{buildroot}/%{_sbindir}/rcsyslogd ln -s service %{buildroot}/%{_sbindir}/rcsyslogd
install -m 644 %{SOURCE12} %{buildroot}%{_fillupdir} install -m 644 %{SOURCE12} %{buildroot}%{_fillupdir}
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
for sbin in klogd syslogd ; do for sbin in klogd syslogd ; do
ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin} ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin}
done done
@ -380,7 +380,7 @@ done
%attr(0755,root,root) %dir %ghost %{_rundir}/syslogd %attr(0755,root,root) %dir %ghost %{_rundir}/syslogd
%{_sbindir}/syslogd %{_sbindir}/syslogd
%{_sbindir}/rcsyslogd %{_sbindir}/rcsyslogd
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/syslogd /sbin/syslogd
%endif %endif
@ -390,7 +390,7 @@ done
%{_unitdir}/klogd.service %{_unitdir}/klogd.service
%{_mandir}/man8/klogd.8%{ext_man} %{_mandir}/man8/klogd.8%{ext_man}
%{_sbindir}/klogd %{_sbindir}/klogd
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/sbin/klogd /sbin/klogd
%endif %endif