public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/g4music] rawhide: Revert downstream patch
Date: Wed, 26 Aug 2026 04:06:11 GMT [thread overview]
Message-ID: <178771717155.1.14093943018509960842.rpms-g4music-f26601b179ad@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/g4music
Branch : rawhide
Commit : f26601b179adf823993583bdbf1de6e0d457e103
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-08-26T00:04:58-04:00
Stats : +3/-14 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/g4music/c/f26601b179adf823993583bdbf1de6e0d457e103?branch=rawhide
Log:
Revert downstream patch
The patch could not be upstreamed because the syntax differs between
appstreamcli and appstream-util.
---
diff --git a/g4music-appstream-util.patch b/g4music-appstream-util.patch
deleted file mode 100644
index d68e833..0000000
--- a/g4music-appstream-util.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- g4music-v4.6.2-36f55b7395df4c27dc195a275248f70373869367/data/meson.build.orig 2026-06-26 21:39:39.000000000 -0600
-+++ g4music-v4.6.2-36f55b7395df4c27dc195a275248f70373869367/data/meson.build 2026-07-16 10:14:14.911478317 -0600
-@@ -56,7 +56,7 @@ if not appstreamcli.found()
- endif
- if appstreamcli.found()
- test('Validate appstream file', appstreamcli,
-- args: ['validate', '--no-net', '--explain', appstream_file],
-+ args: ['validate-relax', '--nonet', appstream_file],
- suite: ['lint'],
- )
- endif
diff --git a/g4music.spec b/g4music.spec
index ce61b22..3bbf9fc 100644
--- a/g4music.spec
+++ b/g4music.spec
@@ -12,12 +12,11 @@ License: GPL-3.0-or-later AND GPL-2.0-or-later AND CC0-1.0
URL: https://gitlab.gnome.org/neithern/g4music
VCS: git:%{url}.git
Source: %{url}/-/archive/v%{version}/%{name}-%{version}.tar.gz
-# Set the arguments to appstream-util to those in the Packaging Guidelines
-Patch: %{name}-appstream-util.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
+BuildRequires: appstream
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: gettext
@@ -69,7 +68,8 @@ Features:
%find_lang %{name}
%check
-# Note that the tests run desktop-file-validate and appstream-util
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.neithern.g4music.metainfo.xml
+# Note that the tests run desktop-file-validate and appstreamcli validate
%meson_test
%files -f %{name}.lang
reply other threads:[~2026-08-26 4:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178771717155.1.14093943018509960842.rpms-g4music-f26601b179ad@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox