From c0a4e56096b86231b6ca4563417d3b0b3c9cf3cb Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen(a)redhat.com>
Date: Fri, 31 Mar 2017 14:40:51 -0600
Subject: Resolves: dogtagpki Pagure Issue #2541
- dogtagpki Pagure Issue #2541 - Re-base Dogtag pki packages to 10.4.x
---
.gitignore | 1 +
pki-console.spec | 37 ++++++++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3f459da..58ea779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ pki-console-1.3.2.tar.gz
/pki-console-10.3.3.tar.gz
/pki-console-10.3.5.tar.gz
/pki-console-10.4.0.tar.gz
+/pki-console-10.4.1.tar.gz
diff --git a/pki-console.spec b/pki-console.spec
index bf5f19d..ab61ecd 100644
--- a/pki-console.spec
+++ b/pki-console.spec
@@ -1,5 +1,5 @@
Name: pki-console
-Version: 10.4.0
+Version: 10.4.1
Release: 1%{?dist}
Summary: Certificate System - PKI Console
URL:
http://pki.fedoraproject.org/
@@ -9,7 +9,7 @@ Group: System Environment/Base
%bcond_without javadoc
%if 0%{?rhel}
-%define pki_core_rhel_version 10.4.0
+%define pki_core_rhel_version 10.4.1
%define pki_core_version %{pki_core_rhel_version}
%else
%define pki_core_version %{version}
@@ -24,10 +24,26 @@ BuildRequires: idm-console-framework
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: ldapjdk
BuildRequires: nspr-devel
-BuildRequires: nss-devel
+%if 0%{?rhel}
+BuildRequires: nss-devel >= 3.28.3
+%else
+%if 0%{?fedora} >= 25
+BuildRequires: nss-devel >= 3.28.3
+%else
+BuildRequires: nss-devel >= 3.27.0
+%endif
+%endif
BuildRequires: junit
BuildRequires: jpackage-utils >= 1.7.5-10
-BuildRequires: jss >= 4.4.0
+%if 0%{?rhel}
+BuildRequires: jss >= 4.4.0-4
+%else
+%if 0%{?fedora} >= 25
+BuildRequires: jss >= 4.4.1
+%else
+BuildRequires: jss >= 4.2.6-44
+%endif
+%endif
BuildRequires: pki-base-java >= %{pki_core_version}
Requires: idm-console-framework
@@ -36,7 +52,15 @@ Requires: ldapjdk
Requires: pki-base-java >= %{pki_core_version}
Requires: pki-console-theme >= %{version}
Requires: jpackage-utils >= 1.7.5-10
-Requires: jss >= 4.4.0
+%if 0%{?rhel}
+Requires: jss >= 4.4.0-4
+%else
+%if 0%{?fedora} >= 25
+Requires: jss >= 4.4.1
+%else
+Requires: jss >= 4.2.6-44
+%endif
+%endif
%if 0%{?rhel}
# NOTE: In the future, as a part of its path, this URL will contain a release
@@ -98,6 +122,9 @@ cd build
%changelog
+* Wed Mar 29 2017 Dogtag Team <pki-devel(a)redhat.com> 10.4.1-1
+- dogtagpki Pagure Issue #2541 - Re-base Dogtag pki packages to 10.4.x
+
* Tue Mar 14 2017 Dogtag Team <pki-devel(a)redhat.com> 10.4.0-1
- Require "jss >= 4.4.0" as a build and runtime requirement
- dogtagpki Pagure Issue #2541 - Re-base Dogtag pki packages to 10.4.x
diff --git a/sources b/sources
index d503510..f07f3aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-console-10.4.0.tar.gz) =
1422847889dcc065ae62afd23cca5dbd199f5f25bc8b2037acd09eecaa680114a555c1dd4ed0f3318c9aa4d1e029d18423e2b487f79762a980611589c77ea27c
+SHA512 (pki-console-10.4.1.tar.gz) =
dca3216fc074039f3b7aae2b051dd5d1389acb5ea8eecddb2a42129d1f90a2b5519ce43beb36d8b98d4ff55be1b68f445c41712db109198f398bf2006d3ee118
--
cgit v1.1
https://src.fedoraproject.org/cgit/pki-console.git/commit/?h=master&i...