public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Milan Crha <mcrha@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gnome-keyring] rawhide: Switch to gnome-srpm-macros macros
Date: Wed, 01 Jul 2026 15:30:15 GMT	[thread overview]
Message-ID: <178291981504.1.4217725069269815302.rpms-gnome-keyring-6ff980f7a5c1@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/gnome-keyring
            Branch : rawhide
            Commit : 6ff980f7a5c1c82902f542fe634303366a44c122
            Author : Milan Crha <mcrha@redhat.com>
            Date   : 2026-07-01T17:28:47+02:00
            Stats  : +5/-8 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/gnome-keyring/c/6ff980f7a5c1c82902f542fe634303366a44c122?branch=rawhide

            Log:
            Switch to gnome-srpm-macros macros

[skip changelog]

---
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 0904d6b..abc9e32 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -4,9 +4,6 @@
 
 %bcond_without ssh_agent
 
-%global tarball_version %%(echo %%{version} | tr '~' '.')
-%global major_version %%(echo %%{tarball_version} | cut -d "." -f 1)
-
 Name:           gnome-keyring
 Version:        50.0
 Release:        %autorelease
@@ -16,7 +13,10 @@ Summary:        Framework for managing passwords and other secrets
 # pkcs11/ is MPL-1.1 OR GPL-2.0-or-later OR  LGPL-2.1-or-later
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND ((GPL-2.0-or-later OR LGPL-3.0-or-later) OR BSD-3-Clause) AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later)
 URL:            https://wiki.gnome.org/Projects/GnomeKeyring
-Source0:        https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{gnome_tarball_version}.tar.xz
+
+%gnome_check_version
+
 # https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/78
 # https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/165
 # https://bugzilla.redhat.com/show_bug.cgi?id=2349314
@@ -72,10 +72,7 @@ automatically unlock the "login" keyring when the user logs in.
 
 
 %prep
-# check for human errors
-if [ `echo "%{version}" | grep -cE "\.alpha|\.beta|\.rc"` = "1" ]; then echo "Error: Use tilde in Version field in front of alpha/beta/rc; checked '%{version}'" 1>&2; exit 1; fi
-
-%autosetup -S git -n %{name}-%{tarball_version}
+%autosetup -S git -n %{name}-%{gnome_tarball_version}
 
 
 %build

                 reply	other threads:[~2026-07-01 15:30 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=178291981504.1.4217725069269815302.rpms-gnome-keyring-6ff980f7a5c1@fedoraproject.org \
    --to=mcrha@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