tomcatjss.spec

@@ -3,13 +3,13 @@ Summary:          Apache Tomcat of JSS Connector
 URL:              http://www.dogtagpki.org/wiki/TomcatJSS
 License:          LGPLv2+
 BuildArch:        noarch
-Version:          8.2.0
+Version:          7.4.1
-Release:          2
+Release:          4
-Source:           https://github.com/dogtagpki/tomcatjss/archive/refs/tags/tomcatjss-8.2.0.tar.gz
+Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
-BuildRequires:    ant apache-commons-lang3 java-latest-openjdk-devel slf4j
+BuildRequires:    ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j
 BuildRequires:    slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7
-Requires:         apache-commons-lang3 java-latest-openjdk-headless jpackage-utils >= 0:1.7.5-15 slf4j slf4j-jdk14 jss >= 5.2.0 tomcat >= 1:9.0.7
+Requires:         apache-commons-lang java-headless jpackage-utils >= 0:1.7.5-15 slf4j jss >= 4.6.0 tomcat >= 1:9.0.7
-Conflicts:        pki-base < 10.10.0
+Conflicts:        tomcat-native pki-base < 10.6.5
 %define           _sharedstatedir    /var/lib
 
 %description
@@ -18,29 +18,17 @@ Apache Tomcat of JSS Connector.
 %prep
 %autosetup -n tomcatjss-%{version} -p 1
 
-%build
-openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
-home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}`
-export JAVA_HOME=/usr/lib/jvm/${home_path}
-./build.sh \
-    %{?_verbose:-v} \
-    --work-dir=%{_vpath_builddir} \
-    --version=%{version} \
-    --jni-dir=%{_jnidir} \
-    dist
-
 %install
-openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16`
+tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}`
+
-export JAVA_HOME=/usr/lib/jvm/${home_path}
+if [ $tomcat_version == "9.0" ]; then
-./build.sh \
+    app_server=tomcat-8.5
-    %{?_verbose:-v} \
+else
-    --work-dir=%{_vpath_builddir} \
+    app_server=tomcat-$tomcat_version
-    --version=%{version} \
+fi
-    --java-dir=%{_javadir} \
+
-    --doc-dir=%{_docdir} \
+ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir} -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
-    --install-dir=%{buildroot} \
+    -Dinstall.jar.dir=%{buildroot}%{_javadir} install
-    install
 
 %files
 %defattr(-,root,root)
@@ -48,21 +36,6 @@ export JAVA_HOME=/usr/lib/jvm/${home_path}
 %{_javadir}/*
 
 %changelog
-* Wed Nov 13 2024 wangkai <13474090681@163.com> - 8.2.0-2
-- Fix build fail for tomcat upgrade
-
-* Fri Mar 31 2023 lilong <lilong@kylinos.cn> - 8.2.0-1
-- Upgrade to 8.2.0
-
-* Mon Nov 21 2022 wulei <wulei80@h-partners.com> - 8.1.0-2
-- Rectify the tomcatjss compilation failure caused by the openjdk-latest upgrade
-
-* Wed Jun 08 2022 Ge Wang <wangge20@h-partners.com> - 8.1.0-1
-- Upgrade to version 8.1.0
-
-* Tue Dec 07 2021 wangkai <wangkai385@huawei.com> - 7.4.1-5
-- Remove conflicts tomcat-native
-
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 7.4.1-4
 - DESC: delete -S git from %autosetup, and delete BuildRequires git