Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: fix missing urllib3 in RPM #332

Merged
merged 10 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-umu-fedora-40.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
uses: actions/[email protected]
with:
name: umu-launcher-rpm-40
path: ~/rpmbuild/RPMS/noarch/*.rpm
path: ~/rpmbuild/RPMS/x86_64/*.rpm
2 changes: 1 addition & 1 deletion .github/workflows/build-umu-fedora-41.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
uses: actions/[email protected]
with:
name: umu-launcher-rpm-41
path: ~/rpmbuild/RPMS/noarch/*.rpm
path: ~/rpmbuild/RPMS/x86_64/*.rpm
7 changes: 3 additions & 4 deletions packaging/rpm/umu-launcher.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Define the manual commit as a fallback
%define manual_commit 70645c290dfc6ed10282bf4d2ae38c0bf7b1a3fb
%define manual_commit e9cb4d764013d4c8c3d1166f59581da8f56a3d83

# Optionally define the tag
%define tag 1.1.4
# Check if tag is defined and get the commit hash for the tag, otherwise use manual commit
%{!?tag: %global commit %{manual_commit}}
%{?tag: %global commit %(git rev-list -n 1 %{tag} 2>/dev/null || echo %{manual_commit})}
Expand All @@ -21,7 +20,7 @@ Summary: A tool for launching non-steam games with proton
License: GPLv3
URL: https://github.com/Open-Wine-Components/umu-launcher

BuildArch: noarch
BuildArch: x86_64
BuildRequires: meson >= 0.54.0
BuildRequires: ninja-build
BuildRequires: cmake
Expand All @@ -35,6 +34,7 @@ BuildRequires: python3-installer
BuildRequires: python3-hatchling
BuildRequires: python
BuildRequires: python3
BuildRequires: python3-pip

Requires: python
Requires: python3
Expand All @@ -51,7 +51,6 @@ Recommends: libzstd
%prep
git clone --single-branch --branch main https://github.com/Open-Wine-Components/umu-launcher.git
cd umu-launcher
git checkout %{tag}
git submodule update --init --recursive

%build
Expand Down
Loading