[jakarta-taglibs-standard] Bug 829804
huwang
huwang at fedoraproject.org
Tue Jun 19 09:39:56 UTC 2012
commit b28ac11b1b0765eb2ff400996f25c49156eb8a96
Author: Hui Wang <huwang at redhat.com>
Date: Tue Jun 19 17:35:30 2012 +0800
Bug 829804
jakarta-taglibs-standard-1.1.2-jstl-pom.patch | 26 +++++++++++++++++++
jakarta-taglibs-standard-1.1.2-standard-pom.patch | 25 ++++++++++++++++++
jakarta-taglibs-standard.spec | 28 +++++++++++++++++++-
jstl-1.1.2.pom | 19 ++++++++++++++
standard-1.1.2.pom | 6 ++++
5 files changed, 102 insertions(+), 2 deletions(-)
---
diff --git a/jakarta-taglibs-standard-1.1.2-jstl-pom.patch b/jakarta-taglibs-standard-1.1.2-jstl-pom.patch
new file mode 100644
index 0000000..f3f8e8d
--- /dev/null
+++ b/jakarta-taglibs-standard-1.1.2-jstl-pom.patch
@@ -0,0 +1,26 @@
+--- jstl-1.1.2.pom 2012-06-19 17:05:52.059382074 +0800
++++ jstl-1.1.2.pom-gil 2012-06-19 17:04:58.289054295 +0800
+@@ -10,10 +10,17 @@
+ <url>http://java.sun.com/products/jsp/jstl/</url>
+ <distributionManagement>
+ <downloadUrl>http://java.sun.com/products/jsp/jstl/downloads/</downloadUrl>
+- <relocation>
+- <groupId>javax.servlet</groupId>
+- <artifactId>jstl</artifactId>
+- <version>1.1.2</version>
+- </relocation>
+ </distributionManagement>
++ <dependencies>
++ <dependency>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-servlet-api</artifactId>
++ <version>7.0.27</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-jsp-api</artifactId>
++ <version>7.0.27</version>
++ </dependency>
++ </dependencies>
+ </project>
+\ No newline at end of file
diff --git a/jakarta-taglibs-standard-1.1.2-standard-pom.patch b/jakarta-taglibs-standard-1.1.2-standard-pom.patch
new file mode 100644
index 0000000..75d36cb
--- /dev/null
+++ b/jakarta-taglibs-standard-1.1.2-standard-pom.patch
@@ -0,0 +1,25 @@
+--- standard-1.1.2.pom 2012-06-19 16:43:36.251081977 +0800
++++ standard-1.1.2.pom-gil 2012-06-19 17:06:55.267591862 +0800
+@@ -3,4 +3,21 @@
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
++ <dependencies>
++ <dependency>
++ <groupId>jstl</groupId>
++ <artifactId>jstl</artifactId>
++ <version>1.1.2</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-el-api</artifactId>
++ <version>7.0.27</version>
++ </dependency>
++ <dependency>
++ <groupId>xalan</groupId>
++ <artifactId>xalan</artifactId>
++ <version>2.7.1</version>
++ </dependency>
++ </dependencies>
+ </project>
+\ No newline at end of file
diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index bd5ef41..36e1353 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -33,16 +33,23 @@
Name: jakarta-taglibs-standard
Version: 1.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 0
Summary: An open-source implementation of the JSP Standard Tag Library
License: ASL 2.0
Group: Development/Libraries
URL: http://jakarta.apache.org/taglibs/
-Source: http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz
+Source0: http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-%{version}-src.tar.gz
+Source1: http://repo1.maven.org/maven2/jstl/jstl/%{version}/jstl-%{version}.pom
+Source2: http://repo1.maven.org/maven2/taglibs/standard/%{version}/standard-%{version}.pom
+
Patch0: jakarta-taglibs-standard-1.1.1-build.patch
Patch1: fix-1.6.0-build.patch
Patch2: %{name}-jdbc-4.1.patch
+# remove relocation use -a parameter with %%add_maven_depmap
+# prevent maven/system overflow
+Patch3: jakarta-taglibs-standard-1.1.2-jstl-pom.patch
+Patch4: jakarta-taglibs-standard-1.1.2-standard-pom.patch
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.5.30
@@ -85,6 +92,12 @@ jsp20.jar=$(build-classpath jsp)
jaxp-api.jar=$(build-classpath xalan-j2)
EOBP
+cp -p %{SOURCE1} jstl-1.1.2.pom
+%patch3 -p0
+cp -p %{SOURCE2} standard-1.1.2.pom
+%patch4 -p0
+
+
%build
ant \
-Dfinal.name=%{short_name} \
@@ -100,6 +113,12 @@ cp -p standard/dist/standard/lib/jstl.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-tag
cp -p standard/dist/standard/lib/standard.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-standard.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 jstl-1.1.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jakarta-taglibs-core.pom
+%add_maven_depmap JPP-jakarta-taglibs-core.pom jakarta-taglibs-core.jar -a "javax.servlet:jstl"
+install -pm 644 standard-1.1.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -107,12 +126,17 @@ cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
%{_javadir}/*
+%{_mavenpomdir}/JPP-*.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jun 19 2012 Hui Wang <huwang at redhat.com> 0:1.1.2-5
+- Bug 829804
+
* Wed Feb 8 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.2-4
- Remove test classes that fail to build(non impl methods) with servlet 3/jsp 2.2.
diff --git a/jstl-1.1.2.pom b/jstl-1.1.2.pom
new file mode 100644
index 0000000..bc4c983
--- /dev/null
+++ b/jstl-1.1.2.pom
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <name>Java Server Pages Standard Tag Library</name>
+ <description>
+The JavaServer Pages Standard Tag Library (JSTL) encapsulates, as simple tags, core functionality common to many JSP applications.
+ </description>
+ <url>http://java.sun.com/products/jsp/jstl/</url>
+ <distributionManagement>
+ <downloadUrl>http://java.sun.com/products/jsp/jstl/downloads/</downloadUrl>
+ <relocation>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </relocation>
+ </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/standard-1.1.2.pom b/standard-1.1.2.pom
new file mode 100644
index 0000000..d43698a
--- /dev/null
+++ b/standard-1.1.2.pom
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+</project>
\ No newline at end of file
More information about the scm-commits
mailing list