From d6229250fe14b257b500fc72f4003f2d89cd9aae Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 20 May 2023 13:12:18 +0200 Subject: [PATCH 1/7] Update to 51.6 (RHBZ#2143460) - bug fixes and enhancements - https://github.com/bottlesdevs/Bottles/releases/tag/51.6 - Update depdendencies - Set epoch due to new version scheme - Migrate to SPDX license - Close RHBZ#2160007 --- .gitignore | 1 + bottles.spec | 26 ++++++++++++++++++-------- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 421857e..0ffe0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /bottles-2022.5.28-trento-3.tar.gz /bottles-2022.6.14-brescia-1.tar.gz /bottles-2022.7.14-brescia-3.tar.gz +/Bottles-51.6.tar.gz diff --git a/bottles.spec b/bottles.spec index 4be00b8..6d29669 100644 --- a/bottles.spec +++ b/bottles.spec @@ -1,26 +1,33 @@ %global uuid pm.mirko.%{name} -%global suf brescia-3 +%global gh_name Bottles + +%global forgeurl https://github.com/bottlesdevs/%{gh_name} +%global tag 51.6 Name: bottles -Version: 2022.7.14 +Epoch: 1 +Version: %{tag} Release: %autorelease BuildArch: noarch -License: GPLv3+ +%forgemeta + +License: GPL-3.0-or-later Summary: Easily manage Wine prefix in a new way -URL: https://github.com/bottlesdevs/Bottles -Source0: %{url}/archive/%{version}-%{suf}/%{name}-%{version}-%{suf}.tar.gz +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: python3 -BuildRequires: python3-gobject BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(libadwaita-1) >= 1.1.99 +BuildRequires: blueprint-compiler + Requires: cabextract Requires: glibc(x86-32) %dnl # https://github.com/bottlesdevs/Bottles/issues/601#issuecomment-936772762 Requires: gtk4 @@ -38,6 +45,9 @@ Requires: python3-pyyaml Requires: python3-requests %dnl # needed by the download manager Requires: python3-urllib3 %dnl # needed by the download manager Requires: xdpyinfo %dnl # needed by the display util +Requires: python3-pathvalidate +Requires: python3-fvs +Requires: python3-vkbasalt-cli %description Easily manage Wine prefix in a new way! (Run Windows software and games on @@ -75,7 +85,7 @@ Features: %prep -%autosetup -n Bottles-%{version}-%{suf} +%autosetup -n %{gh_name}-%{version} %build @@ -94,7 +104,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -f %{name}.lang -%license LICENSE +%license COPYING.md %doc README.md %{_bindir}/%{name} %{_bindir}/%{name}-cli diff --git a/sources b/sources index df71b71..a7c74ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bottles-2022.7.14-brescia-3.tar.gz) = 787d1e73554bf22e2614d31fd3692b97de25483ecd7929d59407053cdcbe1fd5cc66f0dd52d92bce0dedad2b6d1f9e4b90ef631c18273f12f86a9c73ed6bab0c +SHA512 (Bottles-51.6.tar.gz) = 0190744b3a99d791ffbd1b7a104565c2fd1f5aa110afe329897d4b29f0f5d669a6ec145468fea85e88b2f20bb2f7f075522760fd7ced94eea1afc0667780b288 From f38db013ba5b7ffa935843e1438fdd9c0438fb2e Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Tue, 12 Sep 2023 18:36:25 +0200 Subject: [PATCH 2/7] blueprint-compiler: ExcludeArch s390x --- bottles.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bottles.spec b/bottles.spec index 6d29669..9de5be6 100644 --- a/bottles.spec +++ b/bottles.spec @@ -10,6 +10,10 @@ Version: %{tag} Release: %autorelease BuildArch: noarch +# blueprint-compiler does not work on s390x: +# https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96 +ExcludeArch: s390x + %forgemeta License: GPL-3.0-or-later From c4f75db22a10abedf025484958450f68ee2ab796 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 9 Sep 2023 15:36:37 +0200 Subject: [PATCH 3/7] Update to 51.9 (RHBZ#2233358) - Update License: value - Update requirements - Close RHBZ#2229175 RHBZ#2227538 RHBZ#2224722 RHBZ#2222906 - Close RHBZ#2221500 --- .gitignore | 1 + bottles.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0ffe0dd..79e799b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /bottles-2022.6.14-brescia-1.tar.gz /bottles-2022.7.14-brescia-3.tar.gz /Bottles-51.6.tar.gz +/Bottles-51.9.tar.gz diff --git a/bottles.spec b/bottles.spec index 9de5be6..649ac37 100644 --- a/bottles.spec +++ b/bottles.spec @@ -2,11 +2,10 @@ %global gh_name Bottles %global forgeurl https://github.com/bottlesdevs/%{gh_name} -%global tag 51.6 Name: bottles Epoch: 1 -Version: %{tag} +Version: 51.9 Release: %autorelease BuildArch: noarch @@ -14,9 +13,13 @@ BuildArch: noarch # https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96 ExcludeArch: s390x +%global tag %{version} %forgemeta -License: GPL-3.0-or-later +# The following two files are licensed as MIT: +# bottles/backend/models/vdict.py +# bottles/backend/utils/vdf.py +License: GPL-3.0-or-later AND MIT Summary: Easily manage Wine prefix in a new way URL: %{forgeurl} Source0: %{forgesource} @@ -52,6 +55,7 @@ Requires: xdpyinfo %dnl # needed by the display util Requires: python3-pathvalidate Requires: python3-fvs Requires: python3-vkbasalt-cli +Requires: ImageMagick %dnl # https://bugzilla.redhat.com/show_bug.cgi?id=2227538 %description Easily manage Wine prefix in a new way! (Run Windows software and games on diff --git a/sources b/sources index a7c74ce..7ec3991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Bottles-51.6.tar.gz) = 0190744b3a99d791ffbd1b7a104565c2fd1f5aa110afe329897d4b29f0f5d669a6ec145468fea85e88b2f20bb2f7f075522760fd7ced94eea1afc0667780b288 +SHA512 (Bottles-51.9.tar.gz) = 81a77f0b02e2ea775bef5591d6be296372544a91fb92c4f39c3cab310887f88d8d9abd1d4b4854dcf8837bd2dc3f6d54c0693b55c60b60d6901e68dda82da1b4 From 7ab2395f3abac19e4730560410cde26f1b12faeb Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 30 Sep 2023 14:00:12 +0200 Subject: [PATCH 4/7] Use forge macros properly No need to define tag since we have releases on GitHub. That makes the `gh_name` macro obsolete. Also setup using forge magic. --- bottles.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bottles.spec b/bottles.spec index 649ac37..7e73bab 100644 --- a/bottles.spec +++ b/bottles.spec @@ -1,7 +1,6 @@ %global uuid pm.mirko.%{name} -%global gh_name Bottles -%global forgeurl https://github.com/bottlesdevs/%{gh_name} +%global forgeurl https://github.com/bottlesdevs/Bottles Name: bottles Epoch: 1 @@ -13,7 +12,6 @@ BuildArch: noarch # https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/96 ExcludeArch: s390x -%global tag %{version} %forgemeta # The following two files are licensed as MIT: @@ -93,7 +91,7 @@ Features: %prep -%autosetup -n %{gh_name}-%{version} +%forgeautosetup -p1 %build From c13be64ca5098977753a4fb7bb7a0e66b824117e Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 30 Sep 2023 14:03:19 +0200 Subject: [PATCH 5/7] Drop obsolete macro --- bottles.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/bottles.spec b/bottles.spec index 7e73bab..94a6c85 100644 --- a/bottles.spec +++ b/bottles.spec @@ -1,5 +1,3 @@ -%global uuid pm.mirko.%{name} - %global forgeurl https://github.com/bottlesdevs/Bottles Name: bottles From a2c07947af292d3ed24768d602a45a8cb2aa3ef5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 30 Sep 2023 14:06:48 +0200 Subject: [PATCH 6/7] Add python3-chardet (RHBZ#2240292) --- bottles.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/bottles.spec b/bottles.spec index 94a6c85..a4cf6f0 100644 --- a/bottles.spec +++ b/bottles.spec @@ -52,6 +52,7 @@ Requires: python3-pathvalidate Requires: python3-fvs Requires: python3-vkbasalt-cli Requires: ImageMagick %dnl # https://bugzilla.redhat.com/show_bug.cgi?id=2227538 +Requires: python3-chardet %dnl # https://bugzilla.redhat.com/show_bug.cgi?id=2240292 %description Easily manage Wine prefix in a new way! (Run Windows software and games on From 63c726507f3e68b7881c471bc3d840a0ddc54daf Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 30 Sep 2023 14:11:28 +0200 Subject: [PATCH 7/7] Add Packit config --- .packit.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..2e9373e --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,16 @@ +upstream_project_url: https://github.com/bottlesdevs/Bottles +upstream_package_name: Bottles +downstream_package_name: bottles + +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - job: koji_build + + trigger: commit + dist_git_branches: + - fedora-all