MDEV-35108: galera rpm build error in Fedora 41

Changed to allow distributions like Fedora 41 to find the galera-4.spec file - thanks to Daniel Black for proposed fix.
MariaDB · Oct 9, 2024 · 987e5f1 · 987e5f1
1 parent 3f19350
commit 987e5f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/packages/galera.spec → scripts/packages/galera-4.spec b/scripts/packages/galera.spec → scripts/packages/galera-4.spec
diff --git a/scripts/packages/rpm.sh b/scripts/packages/rpm.sh
@@ -22,7 +22,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer"
 uname -m | grep -q i686 && \
 cpu_cflags="-mtune=i686" || cpu_cflags="-mtune=core2"
 RPM_OPT_FLAGS="$fast_cflags $cpu_cflags"
-GALERA_SPEC=$SCRIPT_ROOT/galera.spec
+GALERA_SPEC=$SCRIPT_ROOT/galera-4.spec
 
 RELEASE=${RELEASE:-"1"}
 
@@ -65,7 +65,7 @@ fi
 # no cmake3 installed? Pretend the build dependency is cmake
 rpm -q cmake3 || sed -i -e 's/cmake3/cmake/' "$GALERA_SPEC"
 
-$(which rpmbuild) --clean --define "_topdir $RPM_TOP_DIR" \
+rpmbuild --clean --define "_topdir $RPM_TOP_DIR" \
                   --define "optflags $RPM_OPT_FLAGS" \
                   --define "version $1" \
                   --define "dist ${DIST_TAG}" \