diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index a71037e..87506c3 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -6,7 +6,7 @@ Name: sphere-release Version: %{major}.%{minor} -Release: 7%{?dist}.1 +Release: 8%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://msvsphere-os.ru @@ -113,7 +113,6 @@ RemovePathPostfixes: .Server Provides: sphere-release-identity = %{version}-%{release} Conflicts: sphere-release-identity Requires: sphere-release-server = %{version}-%{release} -Requires(pre): /usr/bin/ln %description identity-server @@ -149,8 +148,6 @@ RemovePathPostfixes: .ARM Provides: sphere-release-identity = %{version}-%{release} Conflicts: sphere-release-identity Requires: sphere-release-arm = %{version}-%{release} -Requires(pre): /usr/bin/ln - %description identity-arm Provides the necessary files for a MSVSphere installation that is identifying @@ -349,13 +346,12 @@ install -p -m 0644 %{SOURCE509} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ -%pre -n sphere-release-common -# Workarround for redhat-server-eula problem -if [ $1 = 1 ]; then - if [ -d /usr/share/redhat-release ]; then - rm -rf /usr/share/redhat-release - fi -fi +%pre -p -n sphere-release-common +st = posix.stat("/usr/share/redhat-release") +if st and st.type == "directory" then + os.remove("/usr/share/redhat-release") +end +return 0 %post -n sphere-repos-flatpak /usr/bin/flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo ||: @@ -365,18 +361,14 @@ fi /usr/bin/flatpak remote-delete --system flathub ||: /usr/bin/flatpak remote-delete --system fedora ||: -%post identity-arm -pushd /usr/share/sphere-release/ > /dev/null 2>&1 -ln -sf EULA-ARM EULA ||: -popd > /dev/null 2>&1 +%post -p identity-arm +posix.symlink("/usr/share/sphere-release/EULA-ARM", "/usr/share/sphere-release/EULA") %preun identity-arm /usr/bin/rm -f /usr/share/sphere-release/EULA -%post identity-server -pushd /usr/share/sphere-release/ > /dev/null 2>&1 -ln -sf EULA-SERVER EULA ||: -popd > /dev/null 2>&1 +%post -p identity-server +posix.symlink("/usr/share/sphere-release/EULA-SERVER", "/usr/share/sphere-release/EULA") %preun identity-server /usr/bin/rm -f /usr/share/sphere-release/EULA @@ -446,8 +438,8 @@ popd > /dev/null 2>&1 %changelog -* Mon Mar 18 2024 Arkady L. Shane - 8.9-7.1 -- Return 0 +* Mon Mar 18 2024 Arkady L. Shane - 8.9-8 +- Use lua for some scriptlets to avoid missing /bin/sh * Mon Mar 18 2024 Arkady L. Shane - 8.9-7 - Fix link creation (strange bug during installation)