.gitignore

@@ -1 +1 @@
-SOURCES/tomcatjss-8.0.0.tar.gz
+SOURCES/tomcatjss-7.8.0.tar.gz

.tomcatjss.metadata

@@ -1 +1 @@
-32ac2982d6f8628462a34723d68297371e7c69be SOURCES/tomcatjss-8.0.0.tar.gz
+b866d5baa11685960fa00b600c33af1c2eab55e3 SOURCES/tomcatjss-7.8.0.tar.gz

SPECS/tomcatjss.spec

@@ -2,15 +2,23 @@
 Name:             tomcatjss
 ################################################################################
 
+%global           product_id idm-tomcatjss
+
+# Upstream version number:
+%global           major_version 7
+%global           minor_version 8
+%global           update_version 0
+
 Summary:          JSS Connector for Apache Tomcat
-URL:              http://www.dogtagpki.org/wiki/TomcatJSS
+URL:              https://github.com/dogtagpki/tomcatjss
 License:          LGPLv2+
 BuildArch:        noarch
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          8.0.0
+%global           release_number 1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 # To generate the source tarball:
@@ -34,9 +42,15 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
 # Java
 ################################################################################
 
+%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
+%define java_devel java-1.8.0-openjdk-devel
+%define java_headless java-1.8.0-openjdk-headless
+%define java_home /usr/lib/jvm/jre-1.8.0-openjdk
+%else
 %define java_devel java-11-openjdk-devel
 %define java_headless java-11-openjdk-headless
 %define java_home /usr/lib/jvm/jre-11-openjdk
+%endif
 
 ################################################################################
 # Build Dependencies
@@ -57,19 +71,23 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 5.0.0
+BuildRequires:    jss >= 4.11.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
+BuildRequires:    tomcat
-BuildRequires:    pki-servlet-engine >= 1:9.0.7
+
-%else
+%description
-BuildRequires:    tomcat >= 1:9.0.7
+JSS Connector for Apache Tomcat, installed via the tomcatjss package,
-%endif
+is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+uses Java Security Services (JSS), a Java interface to Network Security
+Services (NSS).
 
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          JSS Connector for Apache Tomcat
+
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -80,14 +98,15 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 5.0.0
+Requires:         jss >= 4.11.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
+Requires:         tomcat
-Requires:         pki-servlet-engine >= 1:9.0.7
+
-%else
+Obsoletes:        tomcatjss < %{version}-%{release}
-Requires:         tomcat >= 1:9.0.7
+Provides:         tomcatjss = %{version}-%{release}
-%endif
+Provides:         tomcatjss = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -98,7 +117,7 @@ Conflicts:        pki-base < 10.10.0
 %define           _sharedstatedir    /var/lib
 %endif
 
-%description
+%description -n %{product_id}
 JSS Connector for Apache Tomcat, installed via the tomcatjss package,
 is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
 uses Java Security Services (JSS), a Java interface to Network Security
@@ -121,14 +140,13 @@ app_server=tomcat-$tomcat_version
 ant -f build.xml \
     -Dversion=%{version} \
     -Dsrc.dir=$app_server \
-    -Ddist.dir=%{_vpath_builddir} \
     -Djnidir=%{_jnidir} \
-    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
+    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{product_id} \
     -Dinstall.jar.dir=%{buildroot}%{_javadir} \
     install
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
 %license LICENSE
@@ -140,12 +158,77 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
-* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-1
+* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-1
-- Rebase to TomcatJSS 8.0.0
+- Rebase to TomcatJSS 7.8.0
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-0.2.alpha1
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-0.1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebase to TomcatJSS 7.8.0-alpha1
-  Related: rhbz#1991688
 
-* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-0.1
+* Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.3-1
-- Rebase to TomcatJSS 8.0.0-alpha1
+- Replace pki-servlet-engine with tomcat
+
+* Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
+- Rebase to TomcatJSS 7.7.1
+
+* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-1
+- Rebase to TomcatJSS 7.7.0
+
+* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-0.1
+- Rebase to TomcatJSS 7.7.0-alpha1
+
+* Tue Nov 17 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.1-1
+- Rebase to TomcatJSS 7.6.1
+
+* Wed Oct 28 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.0-2
+- Bump dependency to JSS 4.8.0
+- Remove unsupported platforms
+
+* Tue Oct 20 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.0-1
+- Rebase to TomcatJSS 7.6.0
+
+* Thu Jul 09 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-1
+- Rebase to TomcatJSS 7.5.0
+
+* Thu Jun 25 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.2
+- Rebase to TomcatJSS 7.5.0-a2
+
+* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.1
+- Rebase to TomcatJSS 7.5.0-a1
+
+* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.1-2
+- Bump dependency to JSS 4.6.0
+
+* Wed Jun 12 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.1-1
+- Rebase to TomcatJSS 7.4.1
+
+* Wed Apr 24 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.0-1
+- Rebase to TomcatJSS 7.4.0
+
+* Fri Oct 05 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.6-1
+- Rebase to TomcatJSS 7.3.6
+
+* Mon Aug 13 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.5-1
+- Rebase to TomcatJSS 7.3.5
+
+* Tue Aug 07 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.4-1
+- Rebase to TomcatJSS 7.3.4
+
+* Tue Aug 07 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.3-2
+- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3)
+
+* Fri Jul 20 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.3-1
+- Rebase to TomcatJSS 7.3.3
+
+* Thu Jul 05 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.2-1
+- Rebase to TomcatJSS 7.3.2
+
+* Fri Jun 15 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.1-1
+- Fix Tomcat dependencies
+- Rebase to TomcatJSS 7.3.1
+
+* Thu Apr 12 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.0-1
+- Clean up spec file
+- Rebase to TomcatJSS 7.3.0 final
+
+* Thu Mar 15 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 7.3.0-0.2
+- Rebase to TomcatJSS 7.3.0 beta