diff --git a/.gitignore b/.gitignore index 91cdc42..d22409c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ tomcatjss-1.2.1.tar.gz +/tomcatjss-2.0.0.tar.gz diff --git a/clog b/clog new file mode 100644 index 0000000..fd1b28c --- /dev/null +++ b/clog @@ -0,0 +1 @@ +- Updated 'tomcatjss' to utilize 'tomcat6'. diff --git a/sources b/sources index b87e580..ee398fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d86772f20edf90f86392fc0f2992a07 tomcatjss-1.2.1.tar.gz +bc433c70483017a2abfe950c38f8f70d tomcatjss-2.0.0.tar.gz diff --git a/tomcatjss.spec b/tomcatjss.spec index ca48fcd..03389ce 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -1,5 +1,5 @@ Name: tomcatjss -Version: 1.2.1 +Version: 2.0.0 Release: 1%{?dist} Summary: JSSE implementation using JSS for Tomcat URL: http://pki.fedoraproject.org/ @@ -14,12 +14,12 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta BuildRequires: ant BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils -BuildRequires: tomcat5 +BuildRequires: tomcat6 BuildRequires: jss >= 4.2.6 Requires: java >= 1:1.6.0 Requires: jpackage-utils -Requires: tomcat5 +Requires: tomcat6 Requires: jss >= 4.2.6 # The 'tomcatjss' package conflicts with the 'tomcat-native' package @@ -35,7 +35,7 @@ Conflicts: tomcat-native %description A Java Secure Socket Extension (JSSE) implementation -using Java Security Services (JSS) for Tomcat 5.5. +using Java Security Services (JSS) for Tomcat 6. NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package because it uses an underlying NSS security model rather than the @@ -61,9 +61,6 @@ unzip %{name}-%{version}.zip -d %{buildroot} cd %{buildroot}%{_javadir} mv %{name}.jar %{name}-%{version}.jar ln -s %{name}-%{version}.jar %{name}.jar -mkdir -p %{buildroot}%{_sharedstatedir}/tomcat5/server/lib -cd %{buildroot}%{_sharedstatedir}/tomcat5/server/lib -ln -s ../../../../../usr/share/java/%{name}.jar %{name}.jar mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version} %clean @@ -74,71 +71,7 @@ rm -rf %{buildroot} %doc %attr(644,root,root) README LICENSE %attr(00755,root,root) %{_datadir}/doc/%{name}-%{version} %{_javadir}/* -%{_sharedstatedir}/tomcat5/server/lib/%{name}.jar %changelog -* Thu Apr 8 2010 Matthew Harmsen 1.2.1-1 -- Update source tarball - -* Tue Apr 6 2010 Matthew Harmsen 1.2.0-4 -- Bugzilla Bug #568787 - pki-ca fails to create SSL connectors -- Bugzilla Bug #573038 - Unable to login on Dogtag EPEL installation - -* Thu Jan 14 2010 Matthew Harmsen 1.2.0-3 -- Bugzilla Bug #441974 - CA Setup Wizard cannot create new Security Domain. -- Added 'Conflicts: tomcat-native' plus descriptive comment -- Updated 'description' section with this information - -* Fri Sep 11 2009 Kevin Wright 1.2.0-2 -- Bugzilla Bug #521979 - Removed references to jre, fedora 8, etc - -* Fri Aug 28 2009 Matthew Harmsen 1.2.0-1 -- Bugzilla Bug #521979 - New Package for Dogtag PKI: tomcatjss - -* Thu Jul 16 2009 Matthew Harmsen 1.1.0-15 -- Release Candidate 4 build - -* Wed Jun 3 2009 Christina Fu 1.1.0-14 -- Bugzilla Bug #455305 - CA ECC signing Key Failure - Bugzilla Bug #223279 - ECC: Ca: unable to perform agent auth on a machine with nCipher ECC HSM -- This log entry does not apply to tomcatjss. Ignore. - -* Fri May 1 2009 Christina Fu - 1.1.0-13 -- Bugzilla #498652 - SSL handshake Failure on RHCS java subsystems with nethsm2000 - -* Thu Feb 26 2009 Kevin Wright - 1.1.0-12 -- Updated to release 1.1.0-12 to build with idm extension - -* Sat Nov 22 2008 Matthew Harmsen 1.1.0-11 -- Updated to require "java" and "java-devel" >= 1.6.0 - -* Thu Aug 02 2007 Thomas kwan 1.1.0-10 -- Required JSS 4.2.5 - -* Fri Apr 26 2007 Kevin McCarthy 1.1.0-9 -- Change specfile to RHEL5 dependencies - -* Fri Apr 20 2007 Thomas Kwan 1.1.0-8 -- Re-integrated Solaris logic into the spec file - -* Wed Apr 4 2007 Thomas Kwan 1.1.0-7 -- Called new JSS api for client authentication - -* Fri Mar 09 2007 Rob Crittenden 1.1.0-6 -- Add Solaris directives for building with pkgbuild - -* Mon Mar 3 2007 Rob Crittenden 1.1.0-5 -- More spec file cleanup - -* Fri Jan 26 2007 Rob Crittenden 1.1.0-4 -- General spec file cleanup -- Added LGPL license - -* Wed Feb 22 2006 Matthew Harmsen 1.1.0-3 -- Renamed "rpm.template" to "pki.template". Filled in Solaris section. - -* Mon Feb 20 2006 Matthew Harmsen 1.1.0-2 -- Separated template into Linux, Solaris, and Changelog sections. - -* Mon Dec 5 2005 Matthew Harmsen 1.1.0-1 -- Initial RPM template. +* Tue Dec 14 2010 John Dennis +- Updated 'tomcatjss' to utilize 'tomcat6'.