rpms/apache-commons-el/devel apache-commons-el.spec, NONE, 1.1 commons-el-1.0-license.patch, NONE, 1.1 commons-el-1.0.pom, NONE, 1.1 commons-el-eclipse-manifest.patch, NONE, 1.1 commons-el-enum.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed May 26 07:57:23 UTC 2010
Author: sochotni
Update of /cvs/pkgs/rpms/apache-commons-el/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21528/devel
Modified Files:
.cvsignore sources
Added Files:
apache-commons-el.spec commons-el-1.0-license.patch
commons-el-1.0.pom commons-el-eclipse-manifest.patch
commons-el-enum.patch import.log
Log Message:
Initial import of apache-commons-el
--- NEW FILE apache-commons-el.spec ---
%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 <<EOBP
build.compiler=modern
junit.jar=$(build-classpath junit)
servlet-api.jar=$(build-classpath tomcat6-servlet-2.5-api)
jsp-api.jar=$(build-classpath tomcat6-jsp-2.1-api)
servletapi.build.notrequired=true
jspapi.build.notrequired=true
EOBP
%build
export CLASSPATH=
export OPT_JAR_LIST=:
%{ant} \
-Dfinal.name=%{short_name} \
-Dj2se.javadoc=%{_javadocdir}/java \
jar javadoc
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
for jar in *-%{version}*; do
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
done
popd # come back from javadir
# pom
install -pD -T -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
# following line is only for backwards compatibility. New packages
# should use proper groupid org.apache.commons
%add_to_maven_depmap commons-el commons-el %{version} JPP %{short_name}
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files
%defattr(-,root,root,-)
%doc LICENSE.txt STATUS.html
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Tue May 25 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-20
- Use tomcat6-jsp and tomcat6-servlet APIs
* Mon May 24 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-19
- Renamed package (jakarta-commons-el->apache-commons-el)
- Dropped epoch, cleanup spec
* Thu Sep 09 2009 Fernando Nasser <fnasser at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 0:1.0-11.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-18
- fix scriptlets
* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-17
- fix pom install
* Wed Jul 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0-16
- add pom
* Mon Apr 27 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0:1.0-10.5
- Fix FTBFS: added BR: tomcat5-jsp-2.0-api (resolves BZ#497179).
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-10.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.0-15
- fix component-info.xml
* Wed Jan 21 2009 David Walluck <dwalluck at redhat.com> 0:1.0-14
- fix jar name in repolib
* Tue Jan 20 2009 David Walluck <dwalluck at redhat.com> 0:1.0-13
- fix repolib location
* Tue Jan 20 2009 David Walluck <dwalluck at redhat.com> 0:1.0-12
- add repolib
* Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0-11
- update header
* Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0-10
- build for JPackage 5
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 0:1.0-9.4
- Update OSGi metadata for Eclipse 3.4.
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0-9.3
- drop repotag
- fix license tag
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0-9jpp.2
- Autorebuild for GCC 4.3
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0-8jpp.2
- Rebuild for selinux ppc32 issue.
* Wed Jul 11 2007 Ben Konrath <bkonrath at redhat.com> - 0:1.0-8jpp.1
- Add eclipse-manifest patch.
From Fernando Nasser <fnasser at redhat.com>:
- Specify source 1.4 due to use of enum as identifier
* Fri Feb 09 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp.1
- Remove duplicate name tag
- Rebuild
* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp.1
- Merge with upstream
* Thu Aug 17 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-7jpp
- Fix AOT support
* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.0-5jpp_4fc
- Rebuilt
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-5jpp_3fc
- rebuild
* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_2fc
- Build with gcj_support enabled
- Add missing BR for jsp (API)
* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-6jpp
- Add AOT support
* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_1fc
- First build for FC6
* Fri May 19 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp_0fc
- Add gcj_support
* Wed Apr 26 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-5jpp
- First JPP 1.7 build
* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0-4jpp_6fc
- stop scriptlet spew
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-4jpp_5fc
- bump again for double-long bug on ppc(64)
* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-4jpp_4fc
- rebuilt again
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-4jpp_3fc
- rebuilt
* Tue Jul 19 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_2fc
- Build on ia64, ppc64, s390 and s390x.
- Switch to aot-compile-rpm.
* Thu Jun 14 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp_1fc
- Upgrade to 1.0-4jpp.
* Thu May 26 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-4jpp
- Don't bundle servletapi sources (which weren't used anyway).
* Thu May 26 2005 Gary Benson <gbenson at redhat.com> - 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 <gbenson at redhat.com> - 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 <gbenson at redhat.com> - 0:1.0-2jpp_2fc
- BC-compile.
* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-2jpp_1fc
- Build into Fedora.
* Thu Oct 21 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0-2jpp_2rh
- Rebuild (no changes)
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0-3jpp
- Rebuild with ant-1.6.2
* Wed Jul 14 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0-2jpp_1rh
- Merge with upstream version that removes dependency on ant-optional
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-2jpp
- Upgrade to Ant 1.6.X
* Fri Jan 9 2004 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:1.0-1jpp
- First build for JPackage
* Wed Dec 17 2003 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:1.0-0.2
- With Javadocs
* Wed Dec 17 2003 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:1.0-0.1
- First build
commons-el-1.0-license.patch:
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE commons-el-1.0-license.patch ---
--- 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 @@
<target name="dist" depends="compile,javadoc"
description="Create binary distribution">
<mkdir dir="${dist.home}"/>
- <copy file="../LICENSE"
- todir="${dist.home}"/>
+ <copy file="LICENSE.txt"
+ tofile="${dist.home}/LICENSE"/>
<copy file="RELEASE-NOTES.txt"
todir="${dist.home}"/>
<antcall target="jar"/>
@@ -242,7 +242,7 @@
description="Create jar">
<mkdir dir="${dist.home}"/>
<mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="../LICENSE"
+ <copy file="LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<jar jarfile="${commons-el.jar}"
manifest="${build.home}/conf/MANIFEST.MF">
@@ -257,7 +257,7 @@
<copy todir="${build.home}/classes/META-INF" filtering="on">
<fileset dir="${conf.home}" includes="*.MF"/>
</copy>
- <copy file="../LICENSE"
+ <copy file="LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<jar jarfile="${commons-el.jar}"
manifest="${build.home}/classes/META-INF/MANIFEST.MF">
--- NEW FILE commons-el-1.0.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<name>EL</name>
<version>1.0</version>
<description>JSP 2.0 Expression Language Interpreter Implementation</description>
<url>http://jakarta.apache.org/commons/el/</url>
<issueManagement>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<address>commons-dev at jakarta.apache.org</address>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2003</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>arista</id>
<name>Nathan Abramson</name>
<email>arista at alum.mit.edu</email>
<organization>Massachusetts Institute of Technology</organization>
</developer>
<developer>
<id>shawn</id>
<name>Shawn Bayern</name>
<email>shawn at apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>pierred</id>
<name>Pierre Delisle</name>
<email>pierre.delisle at sun.com</email>
<organization>Sun Microsystems, Inc.</organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email>craigmcc at apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>luehe</id>
<name>Jan Luehe</name>
<email>jan.luehe at sun.com</email>
<organization>Sun Microsystems, Inc.</organization>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.4-20040521</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jspapi</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0-20040521</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/el/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://jakarta.apache.org//www/jakarta.apache.org/commons/el/</url>
</site>
</distributionManagement>
</project>
commons-el-eclipse-manifest.patch:
MANIFEST.MF | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- NEW FILE commons-el-eclipse-manifest.patch ---
--- 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
commons-el-enum.patch:
build.xml | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE commons-el-enum.patch ---
--- 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 @@
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
debug="${compile.debug}"
+ source="1.4"
+ target="1.4"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
@@ -186,6 +188,8 @@
<javac srcdir="${test.home}"
destdir="${build.home}/tests"
debug="${compile.debug}"
+ source="1.4"
+ target="1.4"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<classpath refid="test.classpath"/>
@@ -214,6 +218,7 @@
<mkdir dir="${dist.home}/docs/api"/>
<javadoc sourcepath="${source.home}"
destdir="${dist.home}/docs/api"
+ source="1.4"
packagenames="org.apache.commons.*"
author="true"
private="true"
--- NEW FILE import.log ---
apache-commons-el-1_0-20_fc12:HEAD:apache-commons-el-1.0-20.fc12.src.rpm:1274860593
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-el/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 25 May 2010 20:54:22 -0000 1.1
+++ .cvsignore 26 May 2010 07:57:21 -0000 1.2
@@ -0,0 +1 @@
+commons-el-1.0-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apache-commons-el/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 25 May 2010 20:54:22 -0000 1.1
+++ sources 26 May 2010 07:57:22 -0000 1.2
@@ -0,0 +1 @@
+25038283a0b5f638db5e891295d20020 commons-el-1.0-src.tar.gz
More information about the scm-commits
mailing list