[tomcatjss] Bug 819554 - tomcatjss: Please migrate from tomcat6 to tomcat7

[Christina Fu]

commit ea03958c120bcad0242562952126137d0e528bc4
Author: Christina Fu <cfu at redhat.com>
Date:   Fri Jan 4 13:52:25 2013 -0800

    Bug 819554 - tomcatjss: Please migrate from tomcat6 to tomcat7

 .gitignore     |    1 +
 sources        |    2 +-
 tomcatjss.spec |   23 +++++++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74b1f09..ddf6197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-6.0.1.tar.gz
 /tomcatjss-6.0.2.tar.gz
 /tomcatjss-7.0.0.tar.gz
+/tomcatjss-7.1.0.tar.gz
diff --git a/sources b/sources
index 4580d6d..8e734a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf85643b3dc60e45680822533a2f21f6  tomcatjss-7.0.0.tar.gz
+e7613b44361bdd17639afbd0e4119a48  tomcatjss-7.1.0.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 84775f6..229682f 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,6 +1,6 @@
 Name:     tomcatjss
-Version:  7.0.0
-Release:  3%{?dist}
+Version:  7.1.0
+Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
 License:  LGPLv2+
@@ -19,7 +19,6 @@ 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
 
 Requires:         java
 Requires:         jpackage-utils >= 0:1.7.5-15
@@ -39,7 +38,7 @@ Conflicts:        tomcat-native
 
 %description
 A Java Secure Socket Extension (JSSE) implementation
-using Java Security Services (JSS) for Tomcat 6.
+using Java Security Services (JSS) for Tomcat 7.
 
 NOTE:  The 'tomcatjss' package conflicts with the 'tomcat-native' package
        because it uses an underlying NSS security model rather than the
@@ -51,19 +50,20 @@ 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
-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 dist/binary
+unzip %{name}-%{version}.zip -d %{buildroot}
+
+# Install our files
 cd %{buildroot}%{_javadir}
-ln -s %{name}-%{version}.jar tomcat7jss.jar
-ln -s %{name}-6.0.99.jar tomcatjss.jar
+mv %{name}.jar %{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{name}.jar
 mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
 
 %clean
@@ -76,6 +76,9 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* Wed Dec 19 2012 Christina Fu <cfu at redhat.com> 7.1.0-1
+- Bugzila Bug #819554 tomcatjss: Please migrate from tomcat6 to tomcat7
+
 * 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