public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tim Theisen <ttheisen@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/condor] f45: Merge branch 'f44' into f45
Date: Mon, 24 Aug 2026 03:17:14 GMT	[thread overview]
Message-ID: <178754143431.1.14959967528656358310.rpms-condor-bbcb0f6ebed5@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/condor
Branch : f45
Commit : bbcb0f6ebed506748dd8014d578a046006a5c703
Author : Tim Theisen <ttheisen@fedoraproject.org>
Date   : 2026-08-23T22:16:58-05:00
Stats  : +15/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/condor/c/bbcb0f6ebed506748dd8014d578a046006a5c703?branch=f45

Log:
Merge branch 'f44' into f45

---
diff --git a/condor.spec b/condor.spec
index f3dc79e..60cee86 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,6 +1,6 @@
 # Set the version and release here
 %global condor_version 25.13.2
-%global condor_release 1
+%global condor_release 2
 
 # set uw_build to 0 for downstream (Fedora or EPEL)
 # UW build includes stuff for testing and tarballs
@@ -461,7 +461,9 @@ BuildArch: noarch
 Requires: %name = %version-%release
 Requires: condor-credmon-local = %{version}-%{release}
 Requires: python3-urllib3
+%if %uw_build
 Requires: htgettoken >= 1.1
+%endif
 
 %description credmon-multi
 Provides concurrent support for the Vault credmon alongside the Local
@@ -1345,6 +1347,9 @@ fi
 # configuration
 
 %changelog
+* Sun Aug 23 2026 Tim Theisen <ttheisen@fedoraproject.org> - 25.13.2-2
+- Drop htgettoken requirement from credmon-multi
+
 * Sun Aug 23 2026 Tim Theisen <ttheisen@fedoraproject.org> - 25.13.2-1
 - Bring upstream and Fedora spec file in sync to speed updates - rhbz#2316408
 - Also fixes build for f45/rawhide - rhbz#2503824

diff --git a/condor.spec b/condor.spec
index 779cd4f..60cee86 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1354,6 +1354,15 @@ fi
 - Bring upstream and Fedora spec file in sync to speed updates - rhbz#2316408
 - Also fixes build for f45/rawhide - rhbz#2503824
 
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 23.9.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 23.9.6-17
+- Rebuilt for openssl 4.0
+
+* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 23.9.6-16
+- Rebuilt for Python 3.15
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 23.9.6-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

             reply	other threads:[~2026-08-24  3:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-24  3:17 Tim Theisen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-08-25 11:56 [rpms/condor] f45: Merge branch 'f44' into f45 Tim Theisen
2026-08-23 21:50 Tim Theisen

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=178754143431.1.14959967528656358310.rpms-condor-bbcb0f6ebed5@fedoraproject.org \
    --to=ttheisen@fedoraproject.org \
    --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