Update rpm spec files and docker image for el9

Signed-off-by: Ryan Bottriell <ryan@bottriell.ca>
spkenv · Mar 5, 2024 · 1bde0f8 · 1bde0f8
1 parent 1c60ee3
commit 1bde0f8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/cspell.json b/cspell.json
@@ -257,6 +257,7 @@
     "acyclical",
     "addrs",
     "alib",
+    "almalinux",
     "anys",
     "apkg",
     "argparse",
@@ -768,5 +769,6 @@
     "xdir",
     "xino",
     "ystem"
-  ]
+  ],
+  "enabled": true
 }
diff --git a/rpmbuild.Dockerfile b/rpmbuild.Dockerfile
@@ -1,9 +1,10 @@
-FROM centos:7 as build_env
+FROM almalinux:9 as build_env
 
 RUN yum install -y \
     epel-release \
-    curl \
+    curl-minimal \
     rpm-build \
+    yum-utils \
     && yum clean all
 
 RUN ln -s cmake3 /usr/bin/cmake

diff --git a/spfs.spec b/spfs.spec
@@ -12,9 +12,9 @@ BuildRequires: gcc-c++
 BuildRequires: make
 BuildRequires: cmake3
 BuildRequires: openssl-devel
-BuildRequires: fuse-devel
+BuildRequires: fuse3-devel
 BuildRequires: m4
-Requires: fuse
+Requires: fuse3
 Requires: rsync
 
 %define debug_package %{nil}
@@ -34,6 +34,8 @@ RELEASE_DIR=%{_builddir}/%{name}-%{version}/target/release
 for cmd in $RELEASE_DIR/spfs $RELEASE_DIR/spfs-*; do
     # skip debug info for commands
     if [[ $cmd =~ \.d$ ]]; then continue; fi
+    # skip windows
+    if [[ $cmd =~ spfs-winfsp$ ]]; then continue; fi
     install -p -m 755 $cmd %{buildroot}/usr/local/bin/
 done
 

diff --git a/spk.spec b/spk.spec
@@ -13,12 +13,12 @@ BuildRequires: libcap-devel
 BuildRequires: openssl-devel
 BuildRequires: python3-devel
 BuildRequires: python3-pip
-BuildRequires: fuse-devel
+BuildRequires: fuse3-devel
 BuildRequires: m4
 BuildRequires: cmake3
 BuildRequires: make
 Requires: bash
-Requires: fuse
+Requires: fuse3
 Requires: rsync
 Obsoletes: spfs
 Provides: spfs = 0.38.0