Skip to content

Commit

Permalink
Updated version number to 7.3.5
Browse files Browse the repository at this point in the history
The tomcatjss.spec.in has been renamed into tomcatjss.spec for
consistency with other projects. The JSS dependency has been
updated as well.

Change-Id: I0ad9129e0d418e3571f1c864320199ec4114cb93
  • Loading branch information
edewata committed Aug 13, 2018
1 parent f51f08b commit b841b2e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ install:
registry.fedoraproject.org/fedora:$FEDORA
- docker exec container dnf install -y dnf-plugins-core gcc make rpm-build
- docker exec container dnf copr -y enable ${TOMCATJSS_7_3_REPO:-@pki/10.6}
- docker exec container dnf builddep -y --spec /root/tomcatjss/tomcatjss.spec.in
- docker exec container dnf builddep -y --spec /root/tomcatjss/tomcatjss.spec
- docker exec container dnf remove -y tomcat-native
- docker exec container /root/tomcatjss/build.sh --with-timestamp --with-commit-id rpm

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ if [ "$BUILD_TARGET" != "src" ] &&
exit 1
fi

SPEC_TEMPLATE="$SRC_DIR/$NAME.spec.in"
SPEC_TEMPLATE="$SRC_DIR/$NAME.spec"
VERSION="`rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}'`"

if [ "$DEBUG" = true ] ; then
Expand Down
6 changes: 3 additions & 3 deletions tomcatjss.spec.in → tomcatjss.spec
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.4
Version: 7.3.5
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1

Expand Down Expand Up @@ -57,7 +57,7 @@ BuildRequires: slf4j-jdk14
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: jss >= 4.4.0-7
%else
BuildRequires: jss >= 4.5.0-0.6
BuildRequires: jss >= 4.5.0-1
%endif

# Tomcat
Expand Down Expand Up @@ -100,7 +100,7 @@ Requires: slf4j-jdk14
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-7
%else
Requires: jss >= 4.5.0-0.6
Requires: jss >= 4.5.0-1
%endif

# Tomcat
Expand Down

0 comments on commit b841b2e

Please sign in to comment.