From a2e73081326061adfc26b714c239186d6f26786e Mon Sep 17 00:00:00 2001
From: chengzihan2 <chengzihan1111@163.com>
Date: Sat, 12 Sep 2020 00:37:47 +0800
Subject: [PATCH 1/2] disable jp_minimal

---
 .jetty.spec.swp | Bin 0 -> 16384 bytes
 jetty.spec      |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .jetty.spec.swp

diff --git a/.jetty.spec.swp b/.jetty.spec.swp
new file mode 100644
index 0000000000000000000000000000000000000000..958d9db5950f1ce4a20cc9b2754798774eb7755d
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/jetty.spec b/jetty.spec
index 93a197a..5016723 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -9,10 +9,10 @@
 %global jettylibdir %{_localstatedir}/lib/%{name}
 %global appdir      %{jettylibdir}/webapps
 %global addver  .v20190215
-%bcond_without     jp_minimal
+%bcond_with     jp_minimal
 Name:                jetty
 Version:             9.4.15
-Release:             2
+Release:             3
 Summary:             Java Webserver and Servlet Container
 License:             ASL 2.0 or EPL-1.0
 URL:                 http://www.eclipse.org/jetty/
@@ -774,6 +774,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri Sep 12 2020 chengzihan2 <chengzihan2@huawei.com> - 9.4.15-3
+- disable jp_minimal
+
 * Fri Sep 4 2020 huanghaitao <huanghaitao8@huawei.com> - 9.4.15-2
 - endable jpmini
 
-- 
Gitee


From a1dac20dc66350d956a6f3d2690e4a7e170b78e8 Mon Sep 17 00:00:00 2001
From: chengzihan2 <chengzihan1111@163.com>
Date: Sat, 12 Sep 2020 00:46:48 +0800
Subject: [PATCH 2/2] disable jp_minimal

---
 .jetty.spec.swp | Bin 16384 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .jetty.spec.swp

diff --git a/.jetty.spec.swp b/.jetty.spec.swp
deleted file mode 100644
index 958d9db5950f1ce4a20cc9b2754798774eb7755d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

-- 
Gitee