!29 Fix build fail for tomcat upgrade

From: @wk333 Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
Fix build fail for tomcat upgrade
2024-11-14 03:26:57 +00:00 · 2024-11-14 10:52:11 +08:00 · 2024-02-27 06:59:24 +00:00 · 2024-02-27 09:43:08 +08:00 · 2022-12-15 10:52:44 +00:00 · 2022-12-15 17:18:17 +08:00
3 changed files with 56 additions and 0 deletions
--- a/tomcatjss-7.6.1.tar.gz
+++ b/tomcatjss-7.6.1.tar.gz
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@ -0,0 +1,52 @@
+Name:             tomcatjss
+Summary:          Apache Tomcat of JSS Connector
+URL:              http://www.dogtagpki.org/wiki/TomcatJSS
+License:          LGPLv2+
+BuildArch:        noarch
+Version:          7.6.1
+Release:          2
+Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
+BuildRequires:    ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j
+BuildRequires:    slf4j-jdk14 jss >= 4.8.0 tomcat >= 1:9.0.7
+Requires:         apache-commons-lang java-headless jpackage-utils >= 0:1.7.5-15 slf4j jss >= 4.8.0 tomcat >= 1:9.0.7
+Conflicts:        pki-base < 10.10.0
+%define           _sharedstatedir    /var/lib
+
+%description
+Apache Tomcat of JSS Connector.
+
+%prep
+%autosetup -n tomcatjss-%{version} -p 1
+
+%install
+tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
+
+if [ $tomcat_version == "9.0" ]; then
+    app_server=tomcat-8.5
+else
+    app_server=tomcat-$tomcat_version
+fi
+
+ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir} -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
+    -Dinstall.jar.dir=%{buildroot}%{_javadir} install
+
+%files
+%defattr(-,root,root)
+%doc README LICENSE
+%{_javadir}/*
+
+%changelog
+* Wed Nov 13 2024 wangkai <13474090681@163.com> - 7.6.1-2
+- Fix build fail for tomcat upgrade
+
+* Tue Feb 27 2024 yaoxin <yao_xin001@hoperun.com> - 7.6.1-1
+- Upgrade to 7.6.1 for fix build error caused by jss update to 4.9.3
+
+* Thu Dec 15 2022 xu_ping <xuping33@h-partners.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
+
+* Sun Apr 26 2020 wutao <wutao61@huawei.com> - 7.4.1-3
+- Package init
--- a/tomcatjss.yaml
+++ b/tomcatjss.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: dogtagpki/tomcatjss
+tag_prefix: "^v"
+seperator: "."
Author	SHA1	Message	Date
openeuler-ci-bot	744293e5ee	!29 Fix build fail for tomcat upgrade From: @wk333 Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen	2024-11-14 03:26:57 +00:00
wk333	c5ce7ab884	Fix build fail for tomcat upgrade	2024-11-14 10:52:11 +08:00
openeuler-ci-bot	a9a1ffc650	!24 Upgrade to 7.6.1 for fix build error caused by jss update to 4.9.3 From: @starlet-dx Reviewed-by: @cherry530 Signed-off-by: @cherry530	2024-02-27 06:59:24 +00:00
starlet-dx	77a0ae764f	Upgrade to 7.6.1 for fix build error caused by jss update to 4.9.3	2024-02-27 09:43:08 +08:00
openeuler-ci-bot	ece3c6de61	!19 remove conflicts tomcat-native From: @cherry530 Reviewed-by: @caodongxia Signed-off-by: @caodongxia	2022-12-15 10:52:44 +00:00
cherry530	b92600122c	Remove conflicts tomcat-native Signed-off-by: cherry530 <xuping33@huawei.com>	2022-12-15 17:18:17 +08:00
openeuler-ci-bot	998f0dedc3	!4 tomcatjss delete -S git from %autosetup, and delete BuildRequires git From: @chenyanpanHW Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1	2021-08-19 08:28:19 +00:00
chenyanpanHW	28f14017e0	delete -S git from %autosetup, and delete BuildRequires git	2021-07-30 23:38:03 +08:00
openeuler-ci-bot	3b9b06424c	!3 package init Merge pull request !3 from jackie_wu123/master	2020-08-10 16:19:30 +08:00
jackie_wu	9d6c7cb006	package init	2020-06-19 17:19:31 +08:00