From 53c2d2aa9271ffef9631887382055b48c541c6d3ad57d8c5177333086557dea6 Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Mon, 11 Oct 2021 21:54:51 +0000 Subject: [PATCH 1/5] Accepting request 924766 from home:emendonca:branches:devel:languages:misc - bsc#1191085: removing rc* service sbin links for UsrMerge compatibility. OBS-URL: https://build.opensuse.org/request/show/924766 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/ooRexx?expand=0&rev=180 --- ooRexx.changes | 5 +++++ ooRexx.spec | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ooRexx.changes b/ooRexx.changes index 78da8fc..c99b3fc 100644 --- a/ooRexx.changes +++ b/ooRexx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 9 16:14:31 UTC 2021 - Erico Mendonca + +- bsc#1191085: removing rc* service sbin links for UsrMerge compatibility. + ------------------------------------------------------------------- Sat Jun 5 20:47:10 UTC 2021 - Erico Mendonca diff --git a/ooRexx.spec b/ooRexx.spec index 729d18b..c45ffa2 100644 --- a/ooRexx.spec +++ b/ooRexx.spec @@ -209,14 +209,12 @@ cd $RPM_BUILD_ROOT/%{_bindir} ln -sf %{_datadir}/ooRexx/rexxtry.rex . # Sort out systemd vs init depending on system version -mkdir $RPM_BUILD_ROOT/sbin %if 0%{?suse_version} > 1230 mkdir -p %{buildroot}%{_unitdir} install -D -m 444 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service -ln -s /sbin/service $RPM_BUILD_ROOT/sbin/rc%{name} %else -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d ln -s %{_bindir}/rxapid $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rxapid ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/sbin/rcrxapid rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service @@ -315,7 +313,6 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?suse_version} > 1230 %{_unitdir}/%{name}.service -/sbin/rcooRexx %else %{_sysconfdir}/init.d/rxapid /sbin/rcrxapid From 271f49e09154ea5d2541d1a9be2b2f89c25cad43759e0c18e51c3b87d4d297f1 Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Fri, 15 Oct 2021 18:39:31 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/ooRexx?expand=0&rev=181 --- ooRexx.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ooRexx.spec b/ooRexx.spec index c45ffa2..f431eda 100644 --- a/ooRexx.spec +++ b/ooRexx.spec @@ -236,6 +236,8 @@ done touch %{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue,rexx.1,rexxc.1,rxqueue.1,rxsubcom.1,oorexx-config.1} %endif +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} + #****************************************************************************** %clean #****************************************************************************** @@ -317,6 +319,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/init.d/rxapid /sbin/rcrxapid %endif +%{_sbindir}/rc%{name} #****************************************************************************** From 447f7f92305a0dd238034856d56472af0cd297c593f74c40f51ec56a92e8d0d5 Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Fri, 15 Oct 2021 18:40:15 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/ooRexx?expand=0&rev=182 --- ooRexx.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ooRexx.changes b/ooRexx.changes index c99b3fc..597f76f 100644 --- a/ooRexx.changes +++ b/ooRexx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 15 18:39:48 UTC 2021 - Erico Mendonca + +- bsc#1191085: re-adding rc* service sbin links with macros. + ------------------------------------------------------------------- Sat Oct 9 16:14:31 UTC 2021 - Erico Mendonca From a57f02aaeb09d679847f2c17e95b84e3e4cdf4b56888f16a0445767e6edef71c Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Fri, 15 Oct 2021 18:43:59 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/ooRexx?expand=0&rev=183 --- ooRexx.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ooRexx.spec b/ooRexx.spec index f431eda..3ea85c3 100644 --- a/ooRexx.spec +++ b/ooRexx.spec @@ -236,7 +236,11 @@ done touch %{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue,rexx.1,rexxc.1,rxqueue.1,rxsubcom.1,oorexx-config.1} %endif +%if 0%{?suse_version} < 1550 +ln -s /sbin/service %{buildroot}%{_sbindir}/rc%{name} +%else ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} +%endif #****************************************************************************** %clean From 947e6186af785b13f0752d22eb59b44c3b1d95b06494b35b79fe7e0aa1ec14a9 Mon Sep 17 00:00:00 2001 From: Erico Mendonca Date: Fri, 15 Oct 2021 18:47:05 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/ooRexx?expand=0&rev=184 --- ooRexx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ooRexx.spec b/ooRexx.spec index 3ea85c3..0aaa9ff 100644 --- a/ooRexx.spec +++ b/ooRexx.spec @@ -236,6 +236,7 @@ done touch %{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue,rexx.1,rexxc.1,rxqueue.1,rxsubcom.1,oorexx-config.1} %endif +mkdir -p %{buildroot}%{_sbindir} %if 0%{?suse_version} < 1550 ln -s /sbin/service %{buildroot}%{_sbindir}/rc%{name} %else