diff --git a/.cvsignore b/.cvsignore index e69de29..e311ccd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +commons-el-1.0-src.tar.gz diff --git a/apache-commons-el.spec b/apache-commons-el.spec new file mode 100644 index 0000000..4a1d6b6 --- /dev/null +++ b/apache-commons-el.spec @@ -0,0 +1,288 @@ + +%global base_name el +%global short_name commons-%{base_name} + + +Name: apache-%{short_name} +Version: 1.0 +Release: 20%{?dist} +Summary: The Apache Commons Extension Language +License: ASL 1.1 +Group: Development/Libraries +URL: http://commons.apache.org/%{base_name} +BuildArch: noarch +Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source1: http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom +Patch0: %{short_name}-%{version}-license.patch +Patch1: %{short_name}-eclipse-manifest.patch +Patch2: %{short_name}-enum.patch +Requires(post): jpackage-utils +Requires(postun): jpackage-utils +BuildRequires: jpackage-utils >= 0:1.6 +BuildRequires: ant +BuildRequires: tomcat6-jsp-2.1-api +BuildRequires: tomcat6-servlet-2.5-api +BuildRequires: junit + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +# This should go away with F-17 +Provides: jakarta-%{short_name} = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release} + +%description +An implementation of standard interfaces and abstract classes for +javax.servlet.jsp.el which is part of the JSP 2.0 specification. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release} + + +%description javadoc +%{summary}. + + +%prep +%setup -q -n %{short_name}-%{version}-src +%patch0 -p1 -b .license +%patch1 -p1 +%patch2 -p1 + +# remove all precompiled stuff +find . -type f -name "*.jar" -exec rm -f {} \; + +cat > build.properties < - 1.0-20 +- Use tomcat6-jsp and tomcat6-servlet APIs + +* Mon May 24 2010 Stanislav Ochotnicky - 1.0-19 +- Renamed package (jakarta-commons-el->apache-commons-el) +- Dropped epoch, cleanup spec + +* Thu Sep 09 2009 Fernando Nasser - 0:1.0-18.1 +- Merge with upstream for: + Add pom and depmap fragment + Removal of ghost symlink + Some spec file cleanups +- Build without AOT compilation + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.0-11.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 08 2009 David Walluck 0:1.0-18 +- fix scriptlets + +* Wed Jul 08 2009 David Walluck 0:1.0-17 +- fix pom install + +* Wed Jul 08 2009 David Walluck 0:1.0-16 +- add pom + +* Mon Apr 27 2009 Milos Jakubicek - 0:1.0-10.5 +- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179). + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-10.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 02 2009 David Walluck 0:1.0-15 +- fix component-info.xml + +* Wed Jan 21 2009 David Walluck 0:1.0-14 +- fix jar name in repolib + +* Tue Jan 20 2009 David Walluck 0:1.0-13 +- fix repolib location + +* Tue Jan 20 2009 David Walluck 0:1.0-12 +- add repolib + +* Wed Aug 13 2008 David Walluck 0:1.0-11 +- update header + +* Wed Aug 13 2008 David Walluck 0:1.0-10 +- build for JPackage 5 + +* Mon Jul 14 2008 Andrew Overholt 0:1.0-9.4 +- Update OSGi metadata for Eclipse 3.4. + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-9.3 +- drop repotag +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0:1.0-9jpp.2 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Fedora Release Engineering - 1.0-8jpp.2 +- Rebuild for selinux ppc32 issue. + +* Wed Jul 11 2007 Ben Konrath - 0:1.0-8jpp.1 +- Add eclipse-manifest patch. + From Fernando Nasser : +- Specify source 1.4 due to use of enum as identifier + +* Fri Feb 09 2007 Fernando Nasser - 0:1.0-7jpp.1 +- Remove duplicate name tag +- Rebuild + +* Thu Aug 17 2006 Fernando Nasser - 0:1.0-7jpp.1 +- Merge with upstream + +* Thu Aug 17 2006 Fernando Nasser - 0:1.0-7jpp +- Fix AOT support + +* Sat Jul 22 2006 Jakub Jelinek - 0:1.0-5jpp_4fc +- Rebuilt + +* Wed Jul 12 2006 Jesse Keating - 0:1.0-5jpp_3fc +- rebuild + +* Fri May 19 2006 Fernando Nasser - 0:1.0-5jpp_2fc +- Build with gcj_support enabled +- Add missing BR for jsp (API) + +* Fri May 19 2006 Fernando Nasser - 0:1.0-6jpp +- Add AOT support + +* Fri May 19 2006 Fernando Nasser - 0:1.0-5jpp_1fc +- First build for FC6 + +* Fri May 19 2006 Fernando Nasser - 0:1.0-5jpp_0fc +- Add gcj_support + +* Wed Apr 26 2006 Fernando Nasser - 0:1.0-5jpp +- First JPP 1.7 build + +* Mon Mar 6 2006 Jeremy Katz - 0:1.0-4jpp_6fc +- stop scriptlet spew + +* Fri Feb 10 2006 Jesse Keating - 0:1.0-4jpp_5fc +- bump again for double-long bug on ppc(64) + +* Wed Dec 21 2005 Jesse Keating - 0:1.0-4jpp_4fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating - 0:1.0-4jpp_3fc +- rebuilt + +* Tue Jul 19 2005 Gary Benson - 0:1.0-4jpp_2fc +- Build on ia64, ppc64, s390 and s390x. +- Switch to aot-compile-rpm. + +* Thu Jun 14 2005 Gary Benson - 0:1.0-4jpp_1fc +- Upgrade to 1.0-4jpp. + +* Thu May 26 2005 Gary Benson - 0:1.0-4jpp +- Don't bundle servletapi sources (which weren't used anyway). + +* Thu May 26 2005 Gary Benson - 0:1.0-3jpp_1fc +- Upgrade to 1.0-3jpp. +- Rearrange how BC-compiled stuff is built and installed. +- Don't bundle servletapi sources (which weren't used anyway). + +* Mon May 23 2005 Gary Benson - 0:1.0-2jpp_3fc +- Add alpha to the list of build architectures (#157522). +- Use absolute paths for rebuild-gcj-db. + +* Thu May 5 2005 Gary Benson - 0:1.0-2jpp_2fc +- BC-compile. + +* Thu Jan 20 2005 Gary Benson - 0:1.0-2jpp_1fc +- Build into Fedora. + +* Thu Oct 21 2004 Fernando Nasser - 0:1.0-2jpp_2rh +- Rebuild (no changes) + +* Sun Aug 23 2004 Randy Watler - 0:1.0-3jpp +- Rebuild with ant-1.6.2 + +* Wed Jul 14 2004 Fernando Nasser - 0:1.0-2jpp_1rh +- Merge with upstream version that removes dependency on ant-optional + +* Tue Jun 01 2004 Randy Watler - 0:1.0-2jpp +- Upgrade to Ant 1.6.X + +* Fri Jan 9 2004 Kaj J. Niemi - 0:1.0-1jpp +- First build for JPackage + +* Wed Dec 17 2003 Kaj J. Niemi - 0:1.0-0.2 +- With Javadocs + +* Wed Dec 17 2003 Kaj J. Niemi - 0:1.0-0.1 +- First build diff --git a/commons-el-1.0-license.patch b/commons-el-1.0-license.patch new file mode 100644 index 0000000..01d0d12 --- /dev/null +++ b/commons-el-1.0-license.patch @@ -0,0 +1,31 @@ +--- commons-el-1.0-src/build.xml.old 2003-12-17 16:00:14.000000000 +0200 ++++ commons-el-1.0-src/build.xml 2003-12-17 16:00:27.000000000 +0200 +@@ -230,8 +230,8 @@ + + +- ++ + + +@@ -242,7 +242,7 @@ + description="Create jar"> + + +- + +@@ -257,7 +257,7 @@ + + + +- + diff --git a/commons-el-1.0.pom b/commons-el-1.0.pom new file mode 100644 index 0000000..d6aae4e --- /dev/null +++ b/commons-el-1.0.pom @@ -0,0 +1,125 @@ + + 4.0.0 + commons-el + commons-el + EL + 1.0 + JSP 2.0 Expression Language Interpreter Implementation + http://jakarta.apache.org/commons/el/ + + http://issues.apache.org/bugzilla/ + + + + +
commons-dev@jakarta.apache.org
+ + + + 2003 + + + Commons Dev List + commons-dev-subscribe@jakarta.apache.org + commons-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org + + + Commons User List + commons-user-subscribe@jakarta.apache.org + commons-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org + + + + + arista + Nathan Abramson + arista@alum.mit.edu + Massachusetts Institute of Technology + + + shawn + Shawn Bayern + shawn@apache.org + Apache Software Foundation + + + pierred + Pierre Delisle + pierre.delisle@sun.com + Sun Microsystems, Inc. + + + craigmcc + Craig McClanahan + craigmcc@apache.org + Apache Software Foundation + + + luehe + Jan Luehe + jan.luehe@sun.com + Sun Microsystems, Inc. + + + + + The Apache Software License, Version 2.0 + /LICENSE.txt + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk + http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk + + + The Apache Software Foundation + http://jakarta.apache.org + + + src/java + src/test + + + maven-surefire-plugin + + + **/*Test.java + + + + + + + + servletapi + servletapi + 2.4-20040521 + provided + + + jspapi + jsp-api + 2.0-20040521 + provided + + + commons-logging + commons-logging + 1.0.3 + + + + + default + Default Repository + file:///www/jakarta.apache.org/builds/jakarta-commons/el/ + + + default + Default Site + scp://jakarta.apache.org//www/jakarta.apache.org/commons/el/ + + + \ No newline at end of file diff --git a/commons-el-eclipse-manifest.patch b/commons-el-eclipse-manifest.patch new file mode 100644 index 0000000..80bc7cf --- /dev/null +++ b/commons-el-eclipse-manifest.patch @@ -0,0 +1,19 @@ +--- commons-el-1.0-src/src/conf/MANIFEST.MF.orig 2007-07-11 12:47:24.000000000 -0400 ++++ commons-el-1.0-src/src/conf/MANIFEST.MF 2007-07-11 12:49:32.000000000 -0400 +@@ -9,3 +9,16 @@ + Implementation-Title: org.apache.commons.el + Implementation-Vendor: Apache Software Foundation + Implementation-Version: 1.0 ++Import-Package: javax.servlet;version="2.4",javax.servlet.http;version ++ ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version=" ++ 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage ++ xt;version="2.0",javax.servlet.resources;version="2.4" ++Bundle-ManifestVersion: 2 ++Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo ++ ns.el.parser;version="1.0.0" ++Bundle-Version: 1.0.0.v200806031608 ++Bundle-SymbolicName: org.apache.commons.el ++Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter ++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 ++Bundle-Localization: plugin ++Bundle-Vendor: Apache Software Foundation diff --git a/commons-el-enum.patch b/commons-el-enum.patch new file mode 100644 index 0000000..9172343 --- /dev/null +++ b/commons-el-enum.patch @@ -0,0 +1,28 @@ +--- commons-el-1.0-src/build.xml.orig 2007-07-20 15:34:15.000000000 -0400 ++++ commons-el-1.0-src/build.xml 2007-07-20 15:36:48.000000000 -0400 +@@ -171,6 +171,8 @@ + + +@@ -186,6 +188,8 @@ + + +@@ -214,6 +218,7 @@ + +