public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jiri Vanek <jvanek@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/java-latest-openjdk] epel8: Merge branch 'epel10' into epel9
Date: Thu, 20 Aug 2026 09:38:32 GMT	[thread overview]
Message-ID: <178721871249.1.18443334570480803978.rpms-java-latest-openjdk-c4029f342002@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/java-latest-openjdk
Branch : epel8
Commit : c4029f34200212138869fc74614a20ccf5db807a
Author : Jiri Vanek <jvanek@redhat.com>
Date   : 2026-08-20T11:37:49+02:00
Stats  : +7/-6 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/java-latest-openjdk/c/c4029f34200212138869fc74614a20ccf5db807a?branch=epel8

Log:
Merge branch 'epel10' into epel9

---
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 7984fda..8ad7dcc 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -2,10 +2,10 @@
 %global featurever 26
 %global interimver 0
 %global updatever 2
-%global patchver 0
-%global buildver 10
-%global portablerelease 1
-%global rpmrelease 2
+%global patchver 1
+%global buildver 0
+%global portablerelease 0
+%global rpmrelease 0
 
 # Define IcedTea version used for SystemTap tapsets and desktop file
 %global icedteaver      6.0.0pre00-c848b93a8598
@@ -98,7 +98,7 @@ License:  Apache-1.1 AND Apache-2.0 AND LicenseRef-Callaway-BSD AND LicenseRef-C
 URL:      http://openjdk.java.net/
 
 # Check if pandoc was available to generate docs (including man pages)
-%if 0%{?rhel} == 8 || 0%{?epel} > 0 || 0%{?fedora} > 0
+%if 0%{?rhel} == 8 || 0%{?epel} > 0 || 0%{?fedora} > 0 || 0%{?eln} > 0
 %global pandoc_available 1
 %else
 %global pandoc_available 0

diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 2878150..8ad7dcc 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -543,7 +543,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 # is the normal priority macro value.
 # This computation is done at RPM macro expansion time, rather than at
 # runtime, to keep scriptlets as simple as possible.
-%define priority_for() %{expand:%[%{?1:1}%{!?1:0} ? %{priority} - 1 : %{priority}]}
+## warning, in epel9 and epel8 is modified version against epel10 and fedoras (older rpm)
+%define priority_for() %{expand:%(if [ ! "x%{?1}" == "x" ] ; then echo  $((%{priority} - 1)) ;else echo %{priority}; fi)}
 
 %global man_comp .gz
 

             reply	other threads:[~2026-08-20  9:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-20  9:38 Jiri Vanek [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-08-23 10:42 [rpms/java-latest-openjdk] epel8: Merge branch 'epel10' into epel9 Jiri Vanek
2026-07-28  7:12 Jiri Vanek

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=178721871249.1.18443334570480803978.rpms-java-latest-openjdk-c4029f342002@fedoraproject.org \
    --to=jvanek@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