Fix rpm arm

Author: CodeDoctorDE

.github/workflows/build.yml

@@ -103,7 +103,9 @@ jobs:
       - name: ⬆️ Checkout
         uses: actions/checkout@v4
       - name: Make yq tool available on Windows runners
-        run: choco install yq
+        run: |
+          choco install yq
+          choco install innosetup
       - uses: subosito/[email protected]
         with:
           flutter-version-file: app/pubspec.yaml

app/linux/rpm/linwood-setonix.spec

@@ -2,7 +2,7 @@ Name:           linwood-setonix
 Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Play games everywhere you like
-BuildArch:      x86_64
+BuildArch:      %{_target_cpu}
 URL:            https://github.com/LinwoodDev/Setonix
 License:        AGPLv3
 Source0:        %{name}-%{version}.tar.gz
@@ -20,11 +20,17 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+
+# Copy binaries and architecture-specific files
 cp %{name} $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -R lib $RPM_BUILD_ROOT/%{_datadir}/%{name}
 cp -R data $RPM_BUILD_ROOT/%{_datadir}/%{name}
+
+# Create symlink for the binary
 ln -s %{_datadir}/%{name}/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name}
-desktop-file-install %{name}.desktop
+
+# Install the desktop file
+desktop-file-install --dir=$RPM_BUILD_ROOT/usr/share/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -33,3 +39,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 /usr/share/applications/
+
+%changelog

app/scripts/build-rpm.sh

@@ -1,40 +1,72 @@
+#!/bin/bash
+
+# Default values for architecture
+DIRECTORY_ARCH="x64"  # Default directory name
+BINARY_ARCH="x86_64"  # Default binary name
+RPM_ARCH="x86_64"     # Default RPM architecture
+
+# Parse command-line arguments
+while getopts "d:b:" opt; do
+  case $opt in
+    d) DIRECTORY_ARCH="$OPTARG" ;;  # Set the directory architecture
+    b) BINARY_ARCH="$OPTARG" ;;    # Set the binary architecture
+    *) 
+      echo "Usage: $0 [-d directory_arch] [-b binary_arch]"
+      exit 1
+      ;;
+  esac
+done
+RPM_ARCH=$BINARY_ARCH
+
+# Normalize architecture names for RPM
+if [ "$RPM_ARCH" == "arm64" ]; then
+  RPM_ARCH="aarch64"
+fi
 # Read version from pubspec
 SETONIX_VERSION_REGEX="version:\s(.+)\+(.+)"
 [[ $(grep -E "${SETONIX_VERSION_REGEX}" pubspec.yaml) =~ ${SETONIX_VERSION_REGEX} ]]
 SETONIX_VERSION="${BASH_REMATCH[1]}"
+
 # Replace - with ~ to match RPM versioning
 RPM_VERSION=$(echo $SETONIX_VERSION | sed 's/-/~/g')
 CURRENT_DIR=$(pwd)
-echo "Building Setonix $RPM_VERSION"
+echo "Building Setonix $RPM_VERSION for $DIRECTORY_ARCH/$BINARY_ARCH ($RPM_ARCH)"
+
+# Clean and set up build directories
 rm -rf build/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 mkdir -p build/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+
 # Copy files
 cp linux/rpm/linwood-setonix.spec build/SPECS/linwood-setonix.spec
-cp -r build/linux/x64/release/bundle build/SOURCES/linwood-setonix-$RPM_VERSION
+cp -r build/linux/${DIRECTORY_ARCH}/release/bundle build/SOURCES/linwood-setonix-$RPM_VERSION
 chmod 755 build/SOURCES/linwood-setonix-$RPM_VERSION/setonix
 mv build/SOURCES/linwood-setonix-$RPM_VERSION/setonix build/SOURCES/linwood-setonix-$RPM_VERSION/linwood-setonix
 cp linux/rpm/linwood-setonix.desktop build/SOURCES/linwood-setonix-$RPM_VERSION/linwood-setonix.desktop
-# Change second line of spec file Version: to match version
+
+# Update .spec file with the correct version
 sed -i "2s/.*/Version: $RPM_VERSION/" build/SPECS/linwood-setonix.spec
-# Create tar
+
+# Create tarball
 cd build/SOURCES/
 # Fix .so files using patchelf
 cd linwood-setonix-$RPM_VERSION/lib
 for file in *.so; do
-  PATCHELF_OUTPUT=$(patchelf --print-rpath $file)
+  PATCHELF_OUTPUT=$(patchelf --print-rpath "$file")
   echo "Checking $file: $PATCHELF_OUTPUT"
   # Skip file if PATCHELF_OUTPUT does not contain CURRENT_DIR
   if [[ ! $PATCHELF_OUTPUT =~ $CURRENT_DIR ]]; then
     echo "Skipping $file"
     continue
   fi
   echo "Fixing $file"
-  patchelf --set-rpath '$ORIGIN' $file
+  patchelf --set-rpath '$ORIGIN' "$file"
 done
 cd ../../
 tar --create --file linwood-setonix-$RPM_VERSION.tar.gz linwood-setonix-$RPM_VERSION
 cd ../../
+
 # Build RPM
 QA_RPATHS=$[ 0x0001|0x0010 ] rpmbuild -bb build/SPECS/linwood-setonix.spec --define "_topdir $(pwd)/build"
-# Copy RPM to build folder
-cp build/RPMS/x86_64/linwood-setonix-*.rpm build/linwood-setonix-linux-x86_64.rpm
+
+# Copy the RPM to the build folder
+cp build/RPMS/${RPM_ARCH}/linwood-setonix-*.rpm build/linwood-setonix-linux-${BINARY_ARCH}.rpm