Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)

Bugzilla Bug #699809 - Convert CS to use systemd (alee)
This commit is contained in:
Kevin Wright 2011-10-05 21:20:14 -07:00
parent ed2aebe483
commit dd51398445
4 changed files with 26 additions and 9 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-2.1.1.tar.gz
/tomcatjss-6.0.0.tar.gz
/tomcatjss-6.0.1.tar.gz
/tomcatjss-6.0.2.tar.gz

3
clog
View File

@ -1 +1,2 @@
Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
Bugzilla Bug #699809 - Convert CS to use systemd (alee)

View File

@ -1 +1 @@
a26d922677b43f21c015a5edf8801287 tomcatjss-6.0.1.tar.gz
0ea5166542168e7ffff47cec714cd7dc tomcatjss-6.0.2.tar.gz

View File

@ -1,5 +1,5 @@
Name: tomcatjss
Version: 6.0.1
Version: 6.0.2
Release: 1%{?dist}
Summary: JSSE implementation using JSS for Tomcat
URL: http://pki.fedoraproject.org/
@ -11,32 +11,43 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
# jpackage-utils requires versioning to meet both build and runtime requirements
# jss requires versioning to meet both build and runtime requirements
# tomcat6 requires versioning to meet both build and runtime requirements
BuildRequires: ant
BuildRequires: java-devel >= 1:1.6.0
%if 0%{?fedora} >= 16
BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.2.6-19.1
BuildRequires: tomcat6 >= 6.0.32-16
%else
BuildRequires: jpackage-utils
%endif
%if 0%{?fedora} >= 15
BuildRequires: jpackage-utils
BuildRequires: jss >= 4.2.6-17
BuildRequires: tomcat6 >= 6.0.30-6
%else
BuildRequires: jpackage-utils
BuildRequires: jss >= 4.2.6-17
BuildRequires: tomcat6
%endif
BuildRequires: jss >= 4.2.6-17
%endif
Requires: java >= 1:1.6.0
%if 0%{?fedora} >= 16
Requires: jpackage-utils >= 0:1.7.5-10
Requires: jss >= 4.2.6-19.1
Requires: tomcat6 >= 6.0.32-16
%else
Requires: jpackage-utils
%endif
%if 0%{?fedora} >= 15
Requires: jpackage-utils
Requires: jss >= 4.2.6-17
Requires: tomcat6 >= 6.0.30-6
%else
Requires: jpackage-utils
Requires: jss >= 4.2.6-17
Requires: tomcat6
%endif
Requires: jss >= 4.2.6-17
%endif
# The 'tomcatjss' package conflicts with the 'tomcat-native' package
# because it uses an underlying NSS security model rather than the
@ -89,6 +100,10 @@ rm -rf %{buildroot}
%{_javadir}/*
%changelog
* Thu Sep 22 2011 Matthew Harmsen <mharmsen@redhat.com> 6.0.2-1
- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 6.0.1-1
- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .