.gitignore

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

.tomcatjss.metadata

@@ -1 +1 @@
-b866d5baa11685960fa00b600c33af1c2eab55e3 SOURCES/tomcatjss-7.8.0.tar.gz
+a57bb5294890c2ddb5e62eb1e9c316d5deb95794 SOURCES/tomcatjss-7.7.1.tar.gz

SPECS/tomcatjss.spec

@@ -2,23 +2,15 @@
 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:              https://github.com/dogtagpki/tomcatjss
+URL:              http://www.dogtagpki.org/wiki/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.
-%global           release_number 1
+Version:          7.7.1
-Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 # To generate the source tarball:
@@ -71,23 +63,19 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.11.0, jss < 5.0.0
+BuildRequires:    jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-BuildRequires:    tomcat
+%if 0%{?rhel} && ! 0%{?eln}
-
+BuildRequires:    pki-servlet-engine >= 1:9.0.7
-%description
+%else
-JSS Connector for Apache Tomcat, installed via the tomcatjss package,
+BuildRequires:    tomcat >= 1:9.0.7
-is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+%endif
-uses Java Security Services (JSS), a Java interface to Network Security
-Services (NSS).
 
 ################################################################################
-%package -n %{product_id}
+# Runtime Dependencies
 ################################################################################
 
-Summary:          JSS Connector for Apache Tomcat
-
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -98,15 +86,14 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.11.0, jss < 5.0.0
+Requires:         jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-Requires:         tomcat
+%if 0%{?rhel} && ! 0%{?eln}
-
+Requires:         pki-servlet-engine >= 1:9.0.7
-Obsoletes:        tomcatjss < %{version}-%{release}
+%else
-Provides:         tomcatjss = %{version}-%{release}
+Requires:         tomcat >= 1:9.0.7
-Provides:         tomcatjss = %{major_version}.%{minor_version}
+%endif
-Provides:         %{product_id} = %{major_version}.%{minor_version}
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -117,7 +104,7 @@ Conflicts:        pki-base < 10.10.0
 %define           _sharedstatedir    /var/lib
 %endif
 
-%description -n %{product_id}
+%description
 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
@@ -141,12 +128,12 @@ ant -f build.xml \
     -Dversion=%{version} \
     -Dsrc.dir=$app_server \
     -Djnidir=%{_jnidir} \
-    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{product_id} \
+    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
     -Dinstall.jar.dir=%{buildroot}%{_javadir} \
     install
 
 ################################################################################
-%files -n %{product_id}
+%files
 ################################################################################
 
 %license LICENSE
@@ -158,15 +145,6 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
-* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-1
-- Rebase to TomcatJSS 7.8.0
-
-* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-0.1
-- Rebase to TomcatJSS 7.8.0-alpha1
-
-* Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.3-1
-- 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