Hello community, here is the log from the commit of package ooRexx for openSUSE:Factory checked in at 2014-11-29 08:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ooRexx (Old) and /work/SRC/openSUSE:Factory/.ooRexx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ooRexx" Changes: -------- --- /work/SRC/openSUSE:Factory/ooRexx/ooRexx.changes 2014-10-11 19:27:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx.changes 2014-11-29 08:39:54.000000000 +0100 @@ -0,0 +1,2 @@ +------------------------------------------------------------------- +Wed Nov 19 18:00:41 UTC 2014 - [email protected] @@ -2 +4 @@ - +- Fixing systemd versus init.d dependencies. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ooRexx.spec ++++++ --- /var/tmp/diff_new_pack.W3MlxZ/_old 2014-11-29 08:39:55.000000000 +0100 +++ /var/tmp/diff_new_pack.W3MlxZ/_new 2014-11-29 08:39:55.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?_unknownos} %define _unknownos 0 %endif @@ -67,22 +68,22 @@ Version: 4.2.0 Release: 0 Summary: Open Object Rexx -Group: Development/Languages/Other License: CPL-1.0 -URL: http://www.oorexx.org/ +Group: Development/Languages/Other +Url: http://www.oorexx.org/ Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc # If we don't include the following option we get bogus dependencies generated -Autoreq: 0 +AutoReq: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ -BuildRequires: bison BuildRequires: autoconf BuildRequires: automake +BuildRequires: bison +BuildRequires: coreutils +BuildRequires: dos2unix +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: dos2unix -BuildRequires: coreutils BuildRequires: subversion %if 0%{?suse_version} > 1230 @@ -180,12 +181,6 @@ #****************************************************************************** make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir} mandir=%{_mandir} pkgdatadir=%{_datadir}/ooRexx install -# Move systemd file to the right path -%if 0%{?suse_version} > 1230 -install -D -m644 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service -rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service -%endif - # REXX system-wide RPM macros mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rpm install -m 644 rpmmacros.rexx $RPM_BUILD_ROOT/%{_sysconfdir}/rpm/macros.rexx @@ -198,12 +193,17 @@ 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 +install -D -m644 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service +rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service +ln -s /%{_unitdir}/%{name}.service $RPM_BUILD_ROOT/sbin/rc%{name} +%else mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d ln -s %{_bindir}/rxapid $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rxapid - -# SUSE-style link for the init script -mkdir $RPM_BUILD_ROOT/%{_sbindir} -ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/%{_sbindir}/rcrxapid +ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/sbin/rcrxapid +%endif # Fix EOL in classes & scripts if needed for f in $RPM_BUILD_ROOT/%{_datadir}/ooRexx/*.cls; do @@ -234,8 +234,6 @@ %doc %dir %{_datadir}/ooRexx %config %{_sysconfdir}/rpm/macros.rexx -%{_sysconfdir}/init.d/rxapid -%{_sbindir}/rcrxapid %{_bindir}/rexx %{_bindir}/rexxc %{_bindir}/rxapi @@ -283,9 +281,12 @@ %if 0%{?suse_version} > 1230 %{_unitdir}/%{name}.service %else -%{_datadir}/ooRexx/rxapid.service +%{_sysconfdir}/init.d/rxapid +/sbin/rcrxapid %endif +/sbin/rcooRexx + #****************************************************************************** %files devel @@ -317,22 +318,40 @@ %{_libdir}/libhostemu.so %{_libdir}/librxunixsys.so +%pre +%if 0%{?suse_version} > 1230 +%service_add_pre ooRexx.service +%endif %post # Add the rxapi service +%if 0%{?suse_version} > 1230 +%service_add_post ooRexx.service +%else %fillup_and_insserv rxapid +%endif + ldconfig exit 0 #****************************************************************************** %preun +%if 0%{?suse_version} > 1230 +%service_del_preun ooRexx.service +%endif #****************************************************************************** %postun #****************************************************************************** +%if 0%{?suse_version} > 1230 +%service_del_postun ooRexx.service +%else %restart_on_update rxapid %insserv_cleanup +%endif + ldconfig exit 0 #****************************************************************************** + %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
