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

Accepting request 1057022 from Base:System

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798) (forwarded request 1055743 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1057022
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=179
This commit is contained in:
Dominique Leuenberger 2023-01-10 13:59:13 +00:00 committed by Git OBS Bridge
commit b7d63bfb6b
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
powerd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 4 11:13:33 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 21 11:29:51 UTC 2021 - Dr. Werner Fink <werner@suse.de> Thu Oct 21 11:29:51 UTC 2021 - Dr. Werner Fink <werner@suse.de>

2
powerd.spec
View File

@ -16,7 +16,7 @@
# #
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%define sbindir %_sbindir %define sbindir %_sbindir
%else %else
%define sbindir /sbin %define sbindir /sbin

5
sysvinit.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 4 11:13:37 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 7 12:20:53 UTC 2022 - Marcus Meissner <meissner@suse.com> Sat May 7 12:20:53 UTC 2022 - Marcus Meissner <meissner@suse.com>

4
sysvinit.spec
View File

@ -16,7 +16,7 @@
# #
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%define sbindir %_sbindir %define sbindir %_sbindir
%define bindir %_bindir %define bindir %_bindir
%else %else
@ -115,7 +115,7 @@ popd
# pidof is part of procps-ng; let's remove the symlinks to killproc5 here # pidof is part of procps-ng; let's remove the symlinks to killproc5 here
rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8} rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8}
%endif %endif
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
# it's all hardcoded in Makefiles so move here # it's all hardcoded in Makefiles so move here
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}