public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/python-merge3] epel10.3: Minor spec-file reformatting
Date: Thu, 03 Sep 2026 19:39:35 GMT [thread overview]
Message-ID: <178846437541.1.16290666971762340739.rpms-python-merge3-46226b9a3b94@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-merge3
Branch : epel10.3
Commit : 46226b9a3b94f7720eafa201f03024b028d7131e
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-09-03T18:32:25+01:00
Stats : +12/-9 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/python-merge3/c/46226b9a3b94f7720eafa201f03024b028d7131e?branch=epel10.3
Log:
Minor spec-file reformatting
[skip changelog]
---
diff --git a/python-merge3.spec b/python-merge3.spec
index 05660f9..fb1b7a4 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -6,11 +6,12 @@ Name: python-merge3
Version: 0.0.16
Release: %autorelease
Summary: Python implementation of 3-way merge
+
License: GPL-2.0-or-later
URL: https://www.breezy-vcs.org
-# PyPI source does not contain tests
-# Source: %%{pypi_source merge3}
-Source: https://github.com/breezy-team/merge3/archive/v%{version}/merge3-%{version}.tar.gz
+%global forgeurl https://github.com/breezy-team/merge3
+Source: %{forgeurl}/archive/v%{version}/merge3-%{version}.tar.gz
+
# pass -v in tox.ini to unittest invocation
Patch: merge3-verbose-testlog.diff
# conditional patches (1000+)
@@ -20,20 +21,20 @@ BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel
-%global _description %{expand:
+%global common_description %{expand:
A Python implementation of 3-way merge of texts.
-Given BASE, OTHER, THIS, tries to produce a combined text
-incorporating the changes from both BASE->OTHER and BASE->THIS.
-All three will typically be sequences of lines.}
+Given BASE, OTHER, THIS, tries to produce a combined text incorporating the
+changes from both BASE->OTHER and BASE->THIS. All three will typically be
+sequences of lines.}
-%description %{_description}
+%description %{common_description}
%package -n python3-merge3
Summary: %{summary}
-%description -n python3-merge3 %{_description}
+%description -n python3-merge3 %{common_description}
%prep
@@ -43,6 +44,7 @@ Summary: %{summary}
%autopatch -p1 1000
%endif
+
%generate_buildrequires
%pyproject_buildrequires -t
@@ -63,6 +65,7 @@ Summary: %{summary}
%files -n python3-merge3 -f %{pyproject_files}
# license already auto-detected, verified with rpm -qpL
%doc README.rst
+
%{_bindir}/merge3
reply other threads:[~2026-09-03 19:39 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=178846437541.1.16290666971762340739.rpms-python-merge3-46226b9a3b94@fedoraproject.org \
--to=code@musicinmybrain.net \
--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