[tomcatjss/f18] Resolves Bugzilla Bug 819554 - tomcatjss: Please migrate from tomcat6 to tomcat7 https://fedorahoste

[Christina Fu]

commit 53dddbd51ce06765b01edef1a745e0caba85ad5c
Author: Christina Fu <cfu at redhat.com>
Date:   Fri Aug 31 15:30:52 2012 -0700

    Resolves Bugzilla Bug 819554 - tomcatjss: Please migrate from tomcat6 to tomcat7
    https://fedorahosted.org/pki/ticket/240

 .gitignore     |    1 +
 clog           |    2 -
 sources        |    2 +-
 tomcatjss.spec |   68 +++++++++++++++++++------------------------------------
 4 files changed, 26 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 073cb1f..74b1f09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-6.0.0.tar.gz
 /tomcatjss-6.0.1.tar.gz
 /tomcatjss-6.0.2.tar.gz
+/tomcatjss-7.0.0.tar.gz
diff --git a/sources b/sources
index 3656d16..4580d6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ea5166542168e7ffff47cec714cd7dc  tomcatjss-6.0.2.tar.gz
+bf85643b3dc60e45680822533a2f21f6  tomcatjss-7.0.0.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index fa36d71..84775f6 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,5 +1,5 @@
 Name:     tomcatjss
-Version:  6.0.2
+Version:  7.0.0
 Release:  3%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
@@ -13,41 +13,18 @@ Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta
 
 # 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
+# tomcat 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:    java-devel
+BuildRequires:    jpackage-utils >= 0:1.7.5-15
+BuildRequires:    jss >= 4.2.6-24
+BuildRequires:    tomcat >= 7.0.27
 BuildRequires:    tomcat6 >= 6.0.32-16
-%else
-%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
-%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
-%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
-%endif
+Requires:         java
+Requires:         jpackage-utils >= 0:1.7.5-15
+Requires:         jss >= 4.2.6-24
+Requires:         tomcat >= 7.0.27
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
 # because it uses an underlying NSS security model rather than the
@@ -74,20 +51,19 @@ NOTE:  The 'tomcatjss' package conflicts with the 'tomcat-native' package
 
 %build
 
-ant -f build.xml -Djnidir=%{_jnidir}
 ant -f build.xml -Djnidir=%{_jnidir} dist
 
 %install
 rm -rf %{buildroot}
 
 # Unpack the files we just built
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-# Install our files
+unzip tomcat7jss/dist/binary/%{name}-%{version}.zip -d %{buildroot}
+mv %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+unzip tomcat6jss/dist/binary/%{name}-6.0.99.zip -d %{buildroot}
+mv %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}-6.0.99.jar
 cd %{buildroot}%{_javadir}
-mv %{name}.jar %{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{name}.jar
+ln -s %{name}-%{version}.jar tomcat7jss.jar
+ln -s %{name}-6.0.99.jar tomcatjss.jar
 mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
 
 %clean
@@ -100,11 +76,15 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Aug  2 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-3
+- PKI TRAC Ticket #283 - Dogtag 10: Integrate Tomcat 6 'tomcatjss.jar' and
+  Tomcat 7 'tomcat7jss.jar' in Fedora 18 tomcatjss package
+
+* Wed Jul 26 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-2
+- Fixed runtime 'Requires' cut/paste typos
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Wed Jun 06 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-1
+- Bugzilla Bug #819554 - tomcatjss: Please migrate from tomcat6 to tomcat7
 
 * Thu Sep 22 2011 Matthew Harmsen <mharmsen at redhat.com> 6.0.2-1
 - Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)