rpms/tomcatjss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebased to TomcatJSS 7.3.2

Browse Source
This commit is contained in:
Endi S. Dewata 2018-07-05 18:06:30 +02:00
parent 3b064dfce4
commit 7487d4dca3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-7.2.4.tar.gz
/tomcatjss-7.3.0.tar.gz
/tomcatjss-7.3.1.tar.gz
/tomcatjss-7.3.2.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (tomcatjss-7.3.1.tar.gz) = c1c001632e9b5765ddaeca6e3bf0149b1ddf9a5fffaf70acb26094e88ee8a358d5ee28ea39f7274a1c440d11cb8fd204cad9190cdd530572a0755b940e76aedc
SHA512 (tomcatjss-7.3.2.tar.gz) = 562b3626bb7ddd7cd3ccee23d2af88aea12f2ea4e2a901438a43053bb7015af22a810fdf0d5c387a2bdccc06699ecf4c2f74c482bb822d5e43abc1364b1e50a6

18
tomcatjss.spec
View File

@ -7,8 +7,9 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch
Version: 7.3.1
Version: 7.3.2
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/tomcatjss.git
@ -18,7 +19,7 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# --prefix tomcatjss-VERSION/ \
# -o tomcatjss-VERSION.tar.gz \
# <version tag>
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tomcatjss-%{version}.tar.gz
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
# To create a patch for all changes since a version tag:
# $ git format-patch \
@ -109,10 +110,10 @@ Requires: slf4j-jdk14
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-7
%else
Requires: jss >= 4.4.4-1
Requires: jss >= 4.5.0-0.3
%endif
#Tomcat
# Tomcat
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: tomcat >= 7.0.69
%else
@ -133,7 +134,9 @@ Requires: tomcat >= 1:9.0.7
# OpenSSL security model, so these two packages may not co-exist.
# (see Bugzilla Bug #441974 for details)
Conflicts: tomcat-native
Conflicts: pki-base < 10.6.0
# PKI
Conflicts: pki-base < 10.6.3
%if 0%{?rhel}
@ -155,7 +158,7 @@ NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package
%prep
################################################################################
%autosetup -n tomcatjss-%{version} -p 1 -S git
%autosetup -n tomcatjss-%{version}%{?_phase} -p 1 -S git
################################################################################
%install
@ -181,6 +184,9 @@ ant -f build.xml \
################################################################################
%changelog
* Thu Jul 5 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.2-1
- Rebased to TomcatJSS 7.3.2
* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.1-1
- Fixed Tomcat dependencies
- Rebased to TomcatJSS 7.3.1