diff --git a/apptainer.spec b/apptainer.spec index 6829a72..d997c3c 100644 --- a/apptainer.spec +++ b/apptainer.spec @@ -42,15 +42,17 @@ Summary: Application and environment virtualization formerly known as Singularity Name: apptainer Version: 1.1.6 -Release: 1 +Release: 2 # See LICENSE.md for first party code (BSD-3-Clause and LBNL BSD) # See LICENSE_THIRD_PARTY.md for incorporated code (ASL 2.0) # See LICENSE_DEPENDENCIES.md for dependencies # License identifiers taken from: https://fedoraproject.org/wiki/Licensing License: BSD and LBNL BSD and ASL 2.0 URL: https://apptainer.org -Source: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz +Source0: https://github.com/%{name}/%{name}/releases/download/v%{package_version}/%{name}-%{package_version}.tar.gz +Patch0: openEuler-golang-1.17.3.patch + %if "%{?squashfuse_version}" != "" Source10: https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz Patch10: 70.patch @@ -251,7 +253,7 @@ BuildRequires: pkgconfig BuildRequires: fuse3-devel BuildRequires: zlib-devel %endif -# Requires: squashfuse +Requires: squashfuse Requires: fakeroot Requires: fuse-overlayfs Requires: e2fsprogs @@ -287,6 +289,7 @@ Provides the optional setuid-root portion of Apptainer. %patch -P 11 -p1 %patch -P 12 -p1 %setup -n %{name}-%{package_version} +%patch -P 0 -p1 %else %autosetup -n %{name}-%{package_version} %endif @@ -432,5 +435,7 @@ fi %attr(4755, root, root) %{_libexecdir}/%{name}/bin/starter-suid %changelog +* Fri Mar 31 2023 Yikun - 1.1.6-2 +- Patch golang version for openEuler 22.03 series * Tue Feb 21 2023 Yikun - 1.1.6-1 - Init package diff --git a/openEuler-golang-1.17.3.patch b/openEuler-golang-1.17.3.patch new file mode 100644 index 0000000..7a25ccd --- /dev/null +++ b/openEuler-golang-1.17.3.patch @@ -0,0 +1,15 @@ +diff -uprN apptainer-1.1.6/mconfig apptainer-1.1.6-new/mconfig +--- apptainer-1.1.6/mconfig 2023-02-14 21:46:54.000000000 +0000 ++++ apptainer-1.1.6-new/mconfig 2023-02-23 16:53:01.416175595 +0000 +@@ -24,8 +24,8 @@ hstld= + hstranlib= + hstobjcopy= + hstgo= +-hstgo_version="1.17.5" +-hstgo_preferred_version="1.17.5" ++hstgo_version="1.17.3" ++hstgo_preferred_version="1.17.3" + hstgo_opts="go" + + tgtcc= +