don't get VERSION from git in makefile, sometimes we build from tarball only. sed the version into makefile during workflow

GloriousEggroll · GloriousEggroll · commit 8bf88544d227 · 2025-02-14T18:50:27.000-07:00
diff --git a/.github/workflows/build-umu-fedora-40.yml b/.github/workflows/build-umu-fedora-40.yml
@@ -29,7 +29,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Install build dependencies
-        run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
+        run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel python3-pyzstd python3-xlib
 
       - name: Extract Version and SHA
         run: |
@@ -47,7 +47,14 @@ jobs:
         env:
           VERSION: ${{ env.VERSION }}
         run: |
+          # Use either provided input or extracted value
+          VERSION=${VERSION}
+          COMMIT_SHA=${COMMIT_SHA}
+
+          echo $VERSION
           git submodule update --init --recursive
+          sed -i "s|^VERSION := .*$|VERSION := ${VERSION}|g" Makefile.in
+
           cd ..
           mkdir -p ~/rpmbuild/SOURCES/
           cp -R umu-launcher umu-launcher-$VERSION/
@@ -56,18 +63,12 @@ jobs:
           rm -Rf umu-launcher-$VERSION/
           cd umu-launcher/
 
-          # Use either provided input or extracted value
-          VERSION=${VERSION}
-          COMMIT_SHA=${COMMIT_SHA}
-
-          echo $VERSION
-          sed -i 's/%global tag/%global tag '"$VERSION"'/' packaging/rpm/umu-launcher.spec
+          sed -i "s|^%global tag .*|%global tag ${VERSION}|g" packaging/rpm/umu-launcher.spec
           cat packaging/rpm/umu-launcher.spec | grep tag
 
           echo $COMMIT_SHA
-          sed -re '/^#%global manual_commit/s|^# ?(.*)|\1|' packaging/rpm/umu-launcher.spec -i
-          sed -i 's/%global manual_commit/%global manual_commit '"$COMMIT_SHA"'/' packaging/rpm/umu-launcher.spec
-          cat packaging/rpm/umu-launcher.spec | grep manual_commit
+          sed -i "s|^%global commit .*|%global commit ${COMMIT_SHA}|g" packaging/rpm/umu-launcher.spec
+          cat packaging/rpm/umu-launcher.spec | grep commit
 
           rpmbuild -ba packaging/rpm/umu-launcher.spec
           mv ~/rpmbuild/RPMS/x86_64/umu-launcher-$VERSION*.rpm \
diff --git a/.github/workflows/build-umu-fedora-41.yml b/.github/workflows/build-umu-fedora-41.yml
@@ -29,7 +29,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Install build dependencies
-        run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel
+        run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3 cargo python3-hatch-vcs python3-wheel libzstd-devel python3-pyzstd python3-xlib
 
       - name: Extract Version and SHA
         run: |
@@ -47,7 +47,14 @@ jobs:
         env:
           VERSION: ${{ env.VERSION }}
         run: |
+          # Use either provided input or extracted value
+          VERSION=${VERSION}
+          COMMIT_SHA=${COMMIT_SHA}
+
+          echo $VERSION
           git submodule update --init --recursive
+          sed -i "s|^VERSION := .*$|VERSION := ${VERSION}|g" Makefile.in
+
           cd ..
           mkdir -p ~/rpmbuild/SOURCES/
           cp -R umu-launcher umu-launcher-$VERSION/
@@ -56,18 +63,12 @@ jobs:
           rm -Rf umu-launcher-$VERSION/
           cd umu-launcher/
 
-          # Use either provided input or extracted value
-          VERSION=${VERSION}
-          COMMIT_SHA=${COMMIT_SHA}
-
-          echo $VERSION
-          sed -i 's/%global tag/%global tag '"$VERSION"'/' packaging/rpm/umu-launcher.spec
+          sed -i "s|^%global tag .*|%global tag ${VERSION}|g" packaging/rpm/umu-launcher.spec
           cat packaging/rpm/umu-launcher.spec | grep tag
 
           echo $COMMIT_SHA
-          sed -re '/^#%global manual_commit/s|^# ?(.*)|\1|' packaging/rpm/umu-launcher.spec -i
-          sed -i 's/%global manual_commit/%global manual_commit '"$COMMIT_SHA"'/' packaging/rpm/umu-launcher.spec
-          cat packaging/rpm/umu-launcher.spec | grep manual_commit
+          sed -i "s|^%global commit .*|%global commit ${COMMIT_SHA}|g" packaging/rpm/umu-launcher.spec
+          cat packaging/rpm/umu-launcher.spec | grep commit
 
           rpmbuild -ba packaging/rpm/umu-launcher.spec
           mv ~/rpmbuild/RPMS/x86_64/umu-launcher-$VERSION*.rpm \
diff --git a/packaging/rpm/umu-launcher.spec b/packaging/rpm/umu-launcher.spec
@@ -2,25 +2,26 @@
 %global tag 1.2.3
 
 # Manual commit is auto-inserted by workflow
-#%global manual_commit
-
-%{!?manual_commit: %global commit %(git rev-list -n 1 %{tag} 2>/dev/null)}
-%{?manual_commit: %global commit %{manual_commit}}
+%global commit e8c6b737f54b24d1ea61ff82f78aa326c3df10b6
 
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global build_timestamp %(date +"%Y%m%d")
 
 %global rel_build 1.%{build_timestamp}.%{shortcommit}%{?dist}
 
+# F41 doesn't ship urllib3 >= 2.0 needed
+%global urllib3 2.3.0
+
 Name:           umu-launcher
 Version:        %{tag}
 Release:        %{rel_build}
 Summary:        A tool for launching non-steam games with proton
 
 License:        GPLv3
 URL:            https://github.com/Open-Wine-Components/umu-launcher
-Source0:        umu-launcher-%{tag}.tar.gz
+Source0:        %{url}/archive/refs/tags/%{tag}.tar.gz#/%{name}-%{tag}.tar.gz
+Source1:        https://github.com/urllib3/urllib3/releases/download/%{urllib3}/urllib3-%{urllib3}.tar.gz
 
 BuildArch:  x86_64
 BuildRequires:  meson >= 0.54.0
@@ -40,20 +41,21 @@ BuildRequires:  python3-pip
 BuildRequires:  libzstd-devel
 BuildRequires:  python3-hatch-vcs
 BuildRequires:  python3-wheel
+BuildRequires:  python3-xlib
+BuildRequires:  python3-pyzstd
 BuildRequires:  cargo
 
 # Can't use these yet, F41 doesn't ship urllib3 >= 2.0 needed
 #BuildRequires:  python3-urllib3
-#BuildRequires:  python3-pyzstd
 
 Requires:	python
 Requires:	python3
 Requires:	python3-xlib
 Requires:	python3-filelock
+Requires:	python3-pyzstd
 
 # Can't use these yet, F41 doesn't ship urllib3 >= 2.0 needed
 #Requires:  python3-urllib3
-#Requires:  python3-pyzstd
 
 Recommends:	python3-cbor2
 Recommends:	python3-xxhash
@@ -69,11 +71,15 @@ AutoReqProv: no
 
 %prep
 %autosetup -p 1
+mv %{SOURCE1} .
+tar -xf urllib3-%{urllib3}.tar.gz
+rm *.tar.gz
+mv urllib3-%{urllib3}/* subprojects/urllib3/
 
 %build
 # Update this when fedora ships urllib3 >= 2.0
 #./configure.sh --prefix=/usr --use-system-pyzstd --use-system-urllib
-./configure.sh --prefix=/usr
+./configure.sh --prefix=/usr --use-system-pyzstd
 make
 
 %install
