Skip to content

Commit

Permalink
Updated SLF4J and JSS dependencies
Browse files Browse the repository at this point in the history
Change-Id: I9a261671000c5b9e0a680dadaad879447822ff69
  • Loading branch information
edewata committed Jul 20, 2018
1 parent d0a6523 commit a2febd0
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions tomcatjss.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch

Version: 7.3.2
Version: 7.3.3
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1

Expand Down Expand Up @@ -61,15 +61,17 @@ BuildRequires: jpackage-utils >= 0:1.7.5-15

# SLF4J
BuildRequires: slf4j
%if 0%{?fedora} || 0%{?rhel} > 7
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
BuildRequires: slf4j-jdk14
%endif

# JSS
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: jss >= 4.4.0-7
%else
BuildRequires: jss >= 4.5.0-0.3
BuildRequires: jss >= 4.5.0-0.4
%endif

# Tomcat
Expand Down Expand Up @@ -102,15 +104,17 @@ Requires: jpackage-utils >= 0:1.7.5-15

# SLF4J
Requires: slf4j
%if 0%{?fedora} || 0%{?rhel} > 7
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
Requires: slf4j-jdk14
%endif

# JSS
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-7
%else
Requires: jss >= 4.5.0-0.3
Requires: jss >= 4.5.0-0.4
%endif

# Tomcat
Expand Down Expand Up @@ -183,7 +187,6 @@ ant -f build.xml \

################################################################################
%changelog

* Thu Mar 15 2018 Dogtag PKI Team <[email protected]> 7.3.0-0
- To list changes in <branch> since <tag>:
$ git log --pretty=oneline --abbrev-commit --no-decorate <tag>..<branch>

0 comments on commit a2febd0

Please sign in to comment.