From 40535891b9d0f70a93cbc6f1f1f7db1952a02acb Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Tue, 8 Sep 2020 09:46:41 +0800
Subject: [PATCH] Remove unnecessary patch

---
 jboss-jstl-1.2-api-endorse_xalan.patch | 45 --------------------------
 jboss-jstl-1.2-api.spec                |  9 +++---
 2 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 jboss-jstl-1.2-api-endorse_xalan.patch

diff --git a/jboss-jstl-1.2-api-endorse_xalan.patch b/jboss-jstl-1.2-api-endorse_xalan.patch
deleted file mode 100644
index daf33e9..0000000
--- a/jboss-jstl-1.2-api-endorse_xalan.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN jboss-jstl-1.2-api-1.0.3.Final/pom.xml jboss-jstl-1.2-api-1.0.3.Final_modified/pom.xml
---- jboss-jstl-1.2-api-1.0.3.Final/pom.xml	2012-03-18 21:42:07.000000000 -0400
-+++ jboss-jstl-1.2-api-1.0.3.Final_modified/pom.xml	2015-10-19 13:26:53.500409162 -0400
-@@ -32,6 +32,41 @@
- 
-   <build>
-     <plugins>
-+      <!-- copy /usr/share/java/xalan-j2.jar to a directory we want javac to endorse -->
-+      <plugin>
-+        <artifactId>maven-resources-plugin</artifactId>
-+        <executions>
-+          <execution>
-+            <id>copy-resource-one</id>
-+            <phase>generate-sources</phase>
-+            <goals>
-+              <goal>copy-resources</goal>
-+            </goals>
-+            <configuration>
-+              <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-+              <resources>
-+                <resource>
-+                  <directory>/usr/share/java</directory>
-+                  <includes>
-+                    <include>xalan-j2.jar</include>
-+                  </includes>
-+                </resource>
-+              </resources>
-+            </configuration>
-+          </execution>
-+        </executions>
-+      </plugin>
-+      <!-- endorse xalan-j2.jar to avoid the confusion with xml.jar for org.apache.xpath.res.XPATHErrorResources -->
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <configuration>
-+          <compilerArguments>
-+            <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
-+          </compilerArguments>
-+        </configuration>
-+      </plugin>
-+
-       <!-- Include LICENSE.txt in the META-INF directory -->
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
diff --git a/jboss-jstl-1.2-api.spec b/jboss-jstl-1.2-api.spec
index fa13451..254f817 100644
--- a/jboss-jstl-1.2-api.spec
+++ b/jboss-jstl-1.2-api.spec
@@ -4,13 +4,12 @@
 %global oname jboss-jstl-api_1.2_spec
 Name:                jboss-jstl-1.2-api
 Version:             1.1.2
-Release:             1
+Release:             2
 Summary:             JSP Standard Template Library 1.2 API
 License:             ASL 2.0 and (CDDL or GPLv2 with exceptions)
 URL:                 https://github.com/jboss/jboss-jstl-api_spec
 Source0:             https://github.com/jboss/jboss-jstl-api_spec/archive/%{oname}-%{namedversion}.tar.gz
 Patch0:              %{name}-fix-fsf-address.patch
-Patch1:              %{name}-endorse_xalan.patch
 BuildRequires:       maven-local mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:       mvn(org.easymock:easymock) mvn(org.jboss:jboss-parent:pom:)
 BuildRequires:       mvn(org.jboss.spec.javax.el:jboss-el-api_3.0_spec)
@@ -30,9 +29,6 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{pname}-%{oname}-%{namedversion}
 %patch0 -p1
-%if 0%{?el7}
-%patch1 -p1
-%endif
 %pom_remove_plugin :maven-source-plugin
 %mvn_file : %{name}
 
@@ -50,5 +46,8 @@ This package contains the API documentation for %{name}.
 %license LICENSE README
 
 %changelog
+* Tue Sep 08 2020 lingsheng <lingsheng@huawei.com> - 1.1.2-2
+- Remove unnecessary patch
+
 * Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 1.1.2-1
 - package init