rpms/jakarta-commons-el/devel commons-el-1.0.pom, NONE, 1.1 jakarta-commons-el-component-info.xml, NONE, 1.1 jakarta-commons-el.spec, 1.45, 1.46
Fernando Nasser
fnasser at fedoraproject.org
Wed Sep 9 14:25:32 UTC 2009
Author: fnasser
Update of /cvs/extras/rpms/jakarta-commons-el/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32147
Modified Files:
jakarta-commons-el.spec
Added Files:
commons-el-1.0.pom jakarta-commons-el-component-info.xml
Log Message:
Merge with upstream for pom, maven depmap fragments and other cleanups
--- 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>
--- NEW FILE jakarta-commons-el-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
<component id="commons-el"
licenseType=""
version="@VERSION@"
tag="@TAG@"
description=""
>
<artifact id="commons-el.jar"/>
<export>
<include input="commons-el.jar"/>
</export>
</component>
</project>
Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- jakarta-commons-el.spec 25 Jul 2009 03:49:45 -0000 1.45
+++ jakarta-commons-el.spec 9 Sep 2009 14:25:32 -0000 1.46
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
@@ -39,38 +38,39 @@
Name: jakarta-commons-el
Version: 1.0
-Release: 11.5%{?dist}
+Release: 18.1%{?dist}
Epoch: 0
Summary: The Jakarta Commons Extension Language
License: ASL 1.1
Group: Development/Libraries/Java
URL: http://jakarta.apache.org/commons/el/
Source0: http://archive.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz
+Source1: http://repo1.maven.org/maven2/commons-el/commons-el/1.0/commons-el-1.0.pom
Patch0: %{short_name}-%{version}-license.patch
Patch1: %{short_name}-eclipse-manifest.patch
Patch2: jakarta-commons-el-enum.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%if ! %{gcj_support}
BuildArch: noarch
%endif
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
-BuildRequires: jsp
+BuildRequires: tomcat5-jsp-2.0-api
BuildRequires: servletapi5
BuildRequires: junit
-BuildRequires: tomcat5-jsp-2.0-api
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%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: Javadoc for %{name}
Group: Development/Documentation
@@ -78,11 +78,6 @@ BuildRequires: java-javadoc
# for /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description javadoc
Javadoc for %{name}.
@@ -109,7 +104,9 @@ jspapi.build.notrequired=true
EOBP
%build
-ant \
+export CLASSPATH=
+export OPT_JAR_LIST=:
+%{ant} \
-Dfinal.name=%{short_name} \
-Dj2se.javadoc=%{_javadocdir}/java \
jar javadoc
@@ -124,10 +121,15 @@ cp -p dist/%{short_name}.jar $RPM_BUILD_
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap commons-el commons-el %{version} JPP %{name}
+
# javadoc
mkdir -p $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} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
@@ -137,26 +139,18 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
-%if %{gcj_support}
%post
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
+%update_maven_depmap
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -166,8 +160,12 @@ fi
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt STATUS.html
-%{_javadir}/*
-
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}-%{version}.jar
+%{_javadir}/%{short_name}.jar
+%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-el-1.0.jar.*
@@ -175,20 +173,54 @@ fi
%files javadoc
%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%changelog
+* 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.
More information about the fedora-extras-commits
mailing list