From d112c9512209a1dacf418caf57b69765752ba339 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 11 Apr 2024 17:45:04 +0300
Subject: [PATCH] Import from CS git

---
 .gitignore           |  2 +-
 .tomcatjss.metadata  |  2 +-
 SPECS/tomcatjss.spec | 60 ++++++++++++++++++++++++++++++--------------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index b210af9..73382fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcatjss-7.7.1.tar.gz
+SOURCES/tomcatjss-7.8.0.tar.gz
diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata
index efa0965..c3f8238 100644
--- a/.tomcatjss.metadata
+++ b/.tomcatjss.metadata
@@ -1 +1 @@
-a57bb5294890c2ddb5e62eb1e9c316d5deb95794 SOURCES/tomcatjss-7.7.1.tar.gz
+b866d5baa11685960fa00b600c33af1c2eab55e3 SOURCES/tomcatjss-7.8.0.tar.gz
diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec
index d6f89a5..5c90250 100644
--- a/SPECS/tomcatjss.spec
+++ b/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:          7.7.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+%global           release_number 1
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 # To generate the source tarball:
@@ -63,19 +71,23 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+BuildRequires:    jss >= 4.11.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-BuildRequires:    pki-servlet-engine >= 1:9.0.7
-%else
-BuildRequires:    tomcat >= 1:9.0.7
-%endif
+BuildRequires:    tomcat
+
+%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
+Services (NSS).
 
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          JSS Connector for Apache Tomcat
+
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -86,14 +98,15 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss >= 4.11.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-Requires:         pki-servlet-engine >= 1:9.0.7
-%else
-Requires:         tomcat >= 1:9.0.7
-%endif
+Requires:         tomcat
+
+Obsoletes:        tomcatjss < %{version}-%{release}
+Provides:         tomcatjss = %{version}-%{release}
+Provides:         tomcatjss = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -104,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
@@ -128,12 +141,12 @@ ant -f build.xml \
     -Dversion=%{version} \
     -Dsrc.dir=$app_server \
     -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
@@ -145,6 +158,15 @@ 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