From 765328615c7fc40d0fd4e3823b76b24adaec87c6 Mon Sep 17 00:00:00 2001
From: yaokai13 <yaokai13@huawei.com>
Date: Mon, 21 Sep 2020 09:24:59 +0800
Subject: [PATCH] disable infinispan and spring

---
 jetty.spec | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 5016723..a991119 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -10,9 +10,11 @@
 %global appdir      %{jettylibdir}/webapps
 %global addver  .v20190215
 %bcond_with     jp_minimal
+%bcond_with     infinispan
+%bcond_with     spring
 Name:                jetty
 Version:             9.4.15
-Release:             3
+Release:             4
 Summary:             Java Webserver and Servlet Container
 License:             ASL 2.0 or EPL-1.0
 URL:                 http://www.eclipse.org/jetty/
@@ -91,12 +93,18 @@ Requires:            %{name}-plus = %{version}-%{release} %{name}-proxy = %{vers
 Requires:            %{name}-rewrite = %{version}-%{release}
 Requires:            %{name}-security = %{version}-%{release} %{name}-server = %{version}-%{release}
 Requires:            %{name}-servlet = %{version}-%{release}
-Requires:            %{name}-servlets = %{version}-%{release} %{name}-spring = %{version}-%{release}
+Requires:            %{name}-servlets = %{version}-%{release}
+%if %{with spring}
+Requires:            %{name}-spring = %{version}-%{release}
+%endif
 Requires:            %{name}-start = %{version}-%{release}
 Requires:            %{name}-unixsocket = %{version}-%{release} %{name}-util = %{version}-%{release}
 Requires:            %{name}-util-ajax = %{version}-%{release}
 Requires:            %{name}-webapp = %{version}-%{release} %{name}-xml = %{version}-%{release}
-Requires:            %{name}-infinispan = %{version}-%{release} %{name}-cdi = %{version}-%{release}
+%if %{with infinispan}
+Requires:            %{name}-infinispan = %{version}-%{release}
+%endif
+Requires:            %{name}-cdi = %{version}-%{release}
 Requires:            %{name}-websocket-api = %{version}-%{release}
 Requires:            %{name}-websocket-client = %{version}-%{release}
 Requires:            %{name}-websocket-common = %{version}-%{release}
@@ -262,10 +270,12 @@ Summary:             FastCGI client module for Jetty
 %description    fcgi-server
 %{extdesc} %{summary}.
 
+%if %{with infinispan}
 %package        infinispan
 Summary:             infinispan module for Jetty
 %description    infinispan
 %{extdesc} %{summary}.
+%endif
 
 %package        jaspi
 Summary:             jaspi module for Jetty
@@ -307,10 +317,12 @@ Summary:             servlets module for Jetty
 %description    servlets
 %{extdesc} %{summary}.
 
+%if %{with spring}
 %package        spring
 Summary:             spring module for Jetty
 %description    spring
 %{extdesc} %{summary}.
+%endif
 
 %package        start
 Summary:             start module for Jetty
@@ -523,7 +535,6 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-jaspi
 %pom_disable_module jetty-rewrite
 %pom_disable_module jetty-nosql
-%pom_disable_module jetty-infinispan
 %pom_disable_module jetty-unixsocket
 %pom_disable_module tests
 %pom_disable_module examples
@@ -534,6 +545,8 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-osgi
 %pom_disable_module jetty-alpn
 %pom_disable_module jetty-home
+%pom_disable_module jetty-infinispan
+%pom_remove_dep jetty-infinispan jetty-home
 %endif # with jp_minimal
 
 %build
@@ -615,6 +628,12 @@ ln -s %{appdir} %{buildroot}%{homedir}/webapps
 rm %{buildroot}%{homedir}/*.txt  %{buildroot}%{homedir}/*.html
 ln -sf %{rundir} %{buildroot}%{homedir}/work
 cp -p %{SOURCE1} %{buildroot}%{homedir}/bin/jetty.sh
+rm -rf %{buildroot}/usr/share/java/jetty/jetty-infinispan.jar
+rm -rf %{buildroot}/usr/share/java/jetty/jetty-spring.jar
+rm -rf %{buildroot}/usr/share/maven-metadata/jetty-jetty-infinispan.xml
+rm -rf %{buildroot}/usr/share/maven-metadata/jetty-jetty-spring.xml
+rm -rf %{buildroot}/usr/share/maven-poms/jetty/jetty-infinispan.pom
+rm -rf %{buildroot}/usr/share/maven-poms/jetty/jetty-spring.pom
 
 %pre
 getent group %username >/dev/null || groupadd -f -g %jtuid -r %username
@@ -697,7 +716,9 @@ exit 0
 
 %files http-spi -f .mfiles-jetty-http-spi
 
+%if %{with infinispan}
 %files infinispan -f .mfiles-jetty-infinispan
+%endif
 
 %files jaspi -f .mfiles-jetty-jaspi
 
@@ -767,13 +788,19 @@ exit 0
 
 %files osgi-boot-jsp -f .mfiles-jetty-osgi-boot-jsp
 
+%if %{with spring}
 %files spring -f .mfiles-jetty-spring
+%endif
+
 %endif # without jp_minimal
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Mon Sep 21 2020 huanghaitao <huanghaitao8@huawei.com> - 9.4.15-4
+- disable infinispan and spring
+
 * Fri Sep 12 2020 chengzihan2 <chengzihan2@huawei.com> - 9.4.15-3
 - disable jp_minimal
 
-- 
Gitee