rpms/jakarta-commons-lang/devel commons-lang-2.3-jpp-depmap.xml, NONE, 1.1 commons-lang-2.3.pom, NONE, 1.1 pom-maven2jpp-depcat.xsl, NONE, 1.1 pom-maven2jpp-mapdeps.xsl, NONE, 1.1 pom-maven2jpp-newdepmap.xsl, NONE, 1.1 .cvsignore, 1.6, 1.7 jakarta-commons-lang-notarget.patch, 1.1, 1.2 jakarta-commons-lang.spec, 1.23, 1.24 sources, 1.5, 1.6
Permaine Cheung (pcheung)
fedora-extras-commits at redhat.com
Wed Jan 23 03:41:20 UTC 2008
Author: pcheung
Update of /cvs/pkgs/rpms/jakarta-commons-lang/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886
Modified Files:
.cvsignore jakarta-commons-lang-notarget.patch
jakarta-commons-lang.spec sources
Added Files:
commons-lang-2.3-jpp-depmap.xml commons-lang-2.3.pom
pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl
Log Message:
Merge with upstream
--- NEW FILE commons-lang-2.3-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
<dependency>
<maven>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<jar>junit.jar</jar>
<version>3.8.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>maven-plugins</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<version>1.1.1</version>
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
<type>plugin</type>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<jar>maven-cobertura-plugin.jar</jar>
<version>1.1.1</version>
<url>http://maven-plugins.sourceforge.net/maven-cobertura-plugin/</url>
<type>plugin</type>
</jpp>
</dependency>
</depset>
--- NEW FILE commons-lang-2.3.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<name>Lang</name>
<version>2.3</version>
<description>Commons.Lang, a package of Java utility classes for the
classes that are in java.lang's hierarchy, or are considered to be so
standard as to justify existence in java.lang.</description>
<url>http://jakarta.apache.org/commons/lang/</url>
<issueManagement>
<url>http://issues.apache.org/jira/</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev at jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</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>dlr</id>
<name>Daniel Rall</name>
<email>dlr at finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>scolebourne</id>
<name>Stephen Colebourne</name>
<email>scolebourne at joda.org</email>
<organization>SITA ATS Ltd</organization>
<roles>
<role>Java Developer</role>
</roles>
<timezone>0</timezone>
</developer>
<developer>
<id>bayard</id>
<name>Henri Yandell</name>
<email>bayard at generationjava.com</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>scaswell</id>
<name>Steven Caswell</name>
<email>stevencaswell at apache.org</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
<timezone>-5</timezone>
</developer>
<developer>
<id>rdonkin</id>
<name>Robert Burrell Donkin</name>
<email>rdonkin at apache.org</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>ggregory</id>
<name>Gary D. Gregory</name>
<email>ggregory at seagullsw.com</email>
<organization>Seagull Software</organization>
<roles>
<role>Java Developer</role>
</roles>
<timezone>-8</timezone>
</developer>
<developer>
<id>psteitz</id>
<name>Phil Steitz</name>
<email>phil at steitz.com</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>fredrik</id>
<name>Fredrik Westermarck</name>
<email></email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>jcarman</id>
<name>James Carman</name>
<email>jcarman at apache.org</email>
<organization>Carman Consulting, Inc.</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<contributors>
<contributor>
<name>C. Scott Ananian</name>
</contributor>
<contributor>
<name>Chris Audley</name>
</contributor>
<contributor>
<name>Stephane Bailliez</name>
</contributor>
<contributor>
<name>Michael Becke</name>
</contributor>
<contributor>
<name>Ola Berg</name>
</contributor>
<contributor>
<name>Nathan Beyer</name>
</contributor>
<contributor>
<name>Stefan Bodewig</name>
</contributor>
<contributor>
<name>Janek Bogucki</name>
</contributor>
<contributor>
<name>Mike Bowler</name>
</contributor>
<contributor>
<name>Sean Brown</name>
</contributor>
<contributor>
<name>Alexander Day Chaffee</name>
</contributor>
<contributor>
<name>Al Chou</name>
</contributor>
<contributor>
<name>Greg Coladonato</name>
</contributor>
<contributor>
<name>Maarten Coene</name>
</contributor>
<contributor>
<name>Justin Couch</name>
</contributor>
<contributor>
<name>Michael Davey</name>
</contributor>
<contributor>
<name>Norm Deane</name>
</contributor>
<contributor>
<name>Ringo De Smet</name>
</contributor>
<contributor>
<name>Russel Dittmar</name>
</contributor>
<contributor>
<name>Steve Downey</name>
</contributor>
<contributor>
<name>Matthias Eichel</name>
</contributor>
<contributor>
<name>Christopher Elkins</name>
</contributor>
<contributor>
<name>Chris Feldhacker</name>
</contributor>
<contributor>
<name>Pete Gieser</name>
</contributor>
<contributor>
<name>Jason Gritman</name>
</contributor>
<contributor>
<name>Matthew Hawthorne</name>
</contributor>
<contributor>
<name>Michael Heuer</name>
</contributor>
<contributor>
<name>Oliver Heger</name>
</contributor>
<contributor>
<name>Chris Hyzer</name>
</contributor>
<contributor>
<name>Marc Johnson</name>
</contributor>
<contributor>
<name>Shaun Kalley</name>
</contributor>
<contributor>
<name>Tetsuya Kaneuchi</name>
</contributor>
<contributor>
<name>Nissim Karpenstein</name>
</contributor>
<contributor>
<name>Ed Korthof</name>
</contributor>
<contributor>
<name>Holger Krauth</name>
</contributor>
<contributor>
<name>Rafal Krupinski</name>
</contributor>
<contributor>
<name>Rafal Krzewski</name>
</contributor>
<contributor>
<name>Craig R. McClanahan</name>
</contributor>
<contributor>
<name>Rand McNeely</name>
</contributor>
<contributor>
<name>Dave Meikle</name>
</contributor>
<contributor>
<name>Nikolay Metchev</name>
</contributor>
<contributor>
<name>Kasper Nielsen</name>
</contributor>
<contributor>
<name>Tim O'Brien</name>
</contributor>
<contributor>
<name>Brian S O'Neill</name>
</contributor>
<contributor>
<name>Andrew C. Oliver</name>
</contributor>
<contributor>
<name>Alban Peignier</name>
</contributor>
<contributor>
<name>Moritz Petersen</name>
</contributor>
<contributor>
<name>Dmitri Plotnikov</name>
</contributor>
<contributor>
<name>Neeme Praks</name>
</contributor>
<contributor>
<name>Eric Pugh</name>
</contributor>
<contributor>
<name>Stephen Putman</name>
</contributor>
<contributor>
<name>Travis Reeder</name>
</contributor>
<contributor>
<name>Antony Riley</name>
</contributor>
<contributor>
<name>Scott Sanders</name>
</contributor>
<contributor>
<name>Ralph Schaer</name>
</contributor>
<contributor>
<name>Henning P. Schmiedehausen</name>
</contributor>
<contributor>
<name>Sean Schofield</name>
</contributor>
<contributor>
<name>Reuben Sivan</name>
</contributor>
<contributor>
<name>Ville Skytta</name>
</contributor>
<contributor>
<name>Jan Sorensen</name>
</contributor>
<contributor>
<name>Glen Stampoultzis</name>
</contributor>
<contributor>
<name>Scott Stanchfield</name>
</contributor>
<contributor>
<name>Jon S. Stevens</name>
</contributor>
<contributor>
<name>Sean C. Sullivan</name>
</contributor>
<contributor>
<name>Ashwin Suresh</name>
</contributor>
<contributor>
<name>Helge Tesgaard</name>
</contributor>
<contributor>
<name>Arun Mammen Thomas</name>
</contributor>
<contributor>
<name>Masato Tezuka</name>
</contributor>
<contributor>
<name>Jeff Varszegi</name>
</contributor>
<contributor>
<name>Chris Webb</name>
</contributor>
<contributor>
<name>Mario Winterer</name>
</contributor>
<contributor>
<name>Stepan Koltsov</name>
</contributor>
<contributor>
<name>Holger Hoffstatte</name>
</contributor>
</contributors>
<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/lang/trunk</connection>
<url>http://svn.apache.org/viewvc/jakarta/commons/proper/lang/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>
<resources>
<resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*TestSuite.java</include>
</includes>
<excludes>
<exclude>**/AllLangTestSuite.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>maven-plugins</groupId>
<artifactId>maven-cobertura-plugin</artifactId>
<version>1.1.1</version>
<configuration>
<scope>test</scope>
<comment>Required only for generating test coverage reports.</comment>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/lang/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://people.apache.org//www/jakarta.apache.org/commons/lang/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>
--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
<xsl:strip-space elements="*"/>
<xsl:template match="*[name() != 'dependencies']|*/text()">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="//dependencies">
<xsl:for-each select="./dependency">
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:choose>
<xsl:when test="./groupId">
<xsl:copy-of select="./groupId"/>
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-before(./id/text(),':') != ''">
<xsl:element name="groupId">
<xsl:value-of select="substring-before(./id/text(),':')"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="groupId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
<xsl:element name="jpp">
<xsl:element name="groupId">JPP</xsl:element>
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:element name="jar">
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:value-of select="./artifactId/text()"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./id/text()"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="./type">
<xsl:choose>
<xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
<xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>.jar</xsl:otherwise>
</xsl:choose>
</xsl:element>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
</xsl:element>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="map" />
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/project" >
<xsl:element name="project">
<xsl:copy-of select="child::*[not(self::dependencies)]"/>
<xsl:if test="not(./dependencies)">
<xsl:element name="dependencies">
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:if>
<xsl:apply-templates select="dependencies"/>
</xsl:element>
</xsl:template>
<xsl:template match="dependencies" >
<xsl:element name="dependencies">
<xsl:for-each select="dependency">
<xsl:if test="./artifactId">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="./artifactId/text()"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="./id/text()"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
</xsl:for-each>
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:template>
<xsl:template name="replace">
<xsl:param name="artifact"/>
<xsl:variable name="this" select="."/>
<xsl:choose>
<xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:if test="../jpp">
<xsl:element name="dependency">
<xsl:copy-of select="../jpp/*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:for-each select="../add/dependency">
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:saxon="http://icl.com/saxon"
extension-element-prefixes="saxon">
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/" >
<xsl:element name="depset">
<saxon:group select="//dependency" group-by="./maven/artifactId">
<xsl:sort select="./maven/artifactId"/>
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:copy-of select="./maven/*[name() != 'properties']"/>
</xsl:element>
<xsl:element name="jpp">
<xsl:copy-of select="./jpp/*[name() != 'properties']"/>
</xsl:element>
</xsl:element>
<saxon:item/>
</saxon:group>
</xsl:element>
</xsl:template>
</xsl:stylesheet>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 17 Jul 2006 23:06:21 -0000 1.6
+++ .cvsignore 23 Jan 2008 03:40:24 -0000 1.7
@@ -1 +1 @@
-commons-lang-2.1-src.tar.gz
+commons-lang-2.3-src.tar.gz
jakarta-commons-lang-notarget.patch:
Index: jakarta-commons-lang-notarget.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang-notarget.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-commons-lang-notarget.patch 17 Jul 2006 23:06:21 -0000 1.1
+++ jakarta-commons-lang-notarget.patch 23 Jan 2008 03:40:24 -0000 1.2
@@ -1,20 +1,20 @@
---- ./build.xml.sav 2006-07-17 18:11:29.000000000 -0400
-+++ ./build.xml 2006-07-17 18:11:46.000000000 -0400
-@@ -55,7 +55,7 @@
- </copy>
- </target>
- <target name="compile" depends="static" description="Compile shareable components">
-- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
-+ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${build.home}/classes" filtering="on">
-@@ -63,7 +63,7 @@
- </copy>
- </target>
- <target name="compile.tests" depends="compile" description="Compile unit test cases">
-- <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
-+ <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
+--- build.xml.orig 2008-01-22 22:02:04.000000000 -0500
++++ build.xml 2008-01-22 22:02:26.000000000 -0500
+@@ -62,7 +62,7 @@
+ </copy>
+ </target>
+ <target name="compile" depends="static" description="Compile shareable components">
+- <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
++ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ <copy todir="${build.home}/classes" filtering="on">
+@@ -70,7 +70,7 @@
+ </copy>
+ </target>
+ <target name="compile.tests" depends="compile" description="Compile unit test cases">
+- <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}">
++ <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}">
+ <classpath refid="test.classpath"/>
+ </javac>
+ <copy todir="${build.home}/tests" filtering="on">
Index: jakarta-commons-lang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jakarta-commons-lang.spec 5 Apr 2007 00:17:20 -0000 1.23
+++ jakarta-commons-lang.spec 23 Jan 2008 03:40:24 -0000 1.24
@@ -28,30 +28,51 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
+%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}}}
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven 0
%define base_name lang
%define short_name commons-%{base_name}
Name: jakarta-%{short_name}
-Version: 2.1
-Release: 6jpp.1%{?dist}
+Version: 2.3
+Release: 1jpp.1%{?dist}
Epoch: 0
Summary: Provides a host of helper utilities for the java.lang API
License: Apache Software License
Group: Development/Libraries/Java
-URL: http://jakarta.apache.org/commons/lang
-Source0: http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.1-src.tar.gz
+URL: http://commons.apache.org/lang/
+Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1: pom-maven2jpp-depcat.xsl
+Source2: pom-maven2jpp-newdepmap.xsl
+Source3: pom-maven2jpp-mapdeps.xsl
+Source4: %{short_name}-%{version}-jpp-depmap.xml
+Source5: %{short_name}-%{version}.pom
Patch0: %{name}-notarget.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRequires: ant-junit, jpackage-utils >= 0:1.5
-
+BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: %{__perl}
+%if %{with_maven}
+BuildRequires: maven >= 0:1.1
+BuildRequires: saxon
+BuildRequires: saxon-scripts
+BuildRequires: maven-plugin-changelog
+BuildRequires: maven-plugin-changes
+BuildRequires: maven-plugin-xdoc
+%endif
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
@@ -74,23 +95,55 @@
Summary: Javadoc for %{name}
Group: Development/Documentation
BuildRequires: java-javadoc
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
%description javadoc
Javadoc for %{name}.
+%if %{with_maven}
+%package manual
+Summary: Documents for %{name}
+Group: Development/Documentation
+
+%description manual
+%{summary}.
+%endif
%prep
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-src
%{__perl} -pi -e 's/\r//g' *.txt
+%{__sed} -i 's/\r//' STATUS.html
+if [ ! -f %{SOURCE4} ]; then
+export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
+echo '<depset>' >> $DEPCAT
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+ popd
+done
+echo >> $DEPCAT
+echo '</depset>' >> $DEPCAT
+/usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml
+fi
%patch0
-%{__sed} -i 's/\r//' STATUS.html
-%{__sed} -i 's/\r//' PROPOSAL.html
-
%build
+%if %{with_maven}
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ cp project.xml project.xml.orig
+ /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+ popd
+done
+
+maven \
+ -Dmaven.javadoc.source=1.4 \
+ -Dmaven.repo.remote=file:/usr/share/maven/repository \
+ -Dmaven.home.local=$(pwd)/.maven \
+ jar javadoc xdoc:transform
+%else
+
# FIXME: There are failures with gcj. Ignore them for now.
%if %{gcj_support}
%ant \
@@ -98,28 +151,54 @@
-Dfinal.name=%{short_name} \
-Djdk.javadoc=%{_javadocdir}/java \
-Dtest.failonerror=false \
- test dist
+ jar javadoc
%else
%ant \
-Djunit.jar=$(find-jar junit) \
-Dfinal.name=%{short_name} \
-Djdk.javadoc=%{_javadocdir}/java \
- test dist
+ jar javadoc
+%endif
+# test dist
%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%if %{with_maven}
+cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%else
cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%endif
(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)
+%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{name}
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE5} \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with_maven}
+cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+## manual
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p STATUS.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%if %{with_maven}
+rm -rf target/docs/apidocs
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
+cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site
+%endif
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
@@ -128,16 +207,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
%post
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -146,11 +227,16 @@
%files
%defattr(0644,root,root,0755)
-%doc PROPOSAL.html STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%dir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/STATUS.html
+%doc %{_docdir}/%{name}-%{version}/*.txt
+#%doc PROPOSAL.html STATUS.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
-
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-lang-2.1.jar.*
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*%{version}.jar.*
%endif
%files javadoc
@@ -158,7 +244,22 @@
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}/site
+%endif
+
%changelog
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:2.3-1jpp.1
+- Merge with upstream
+
+* Mon Aug 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:2.3-1jpp
+- Upgrade to 2.3
+- Build with maven by default
+- Add pom anf depmap frag
+- Make Vendor, Distribution based on macro
+
* Thu Mar 29 2007 Permaine Cheung <pcheung at redhat.com> - 0:2.1-6jpp.1
- Merge from upstream and rpmlint cleanup
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-lang/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Jul 2006 23:06:21 -0000 1.5
+++ sources 23 Jan 2008 03:40:24 -0000 1.6
@@ -1 +1 @@
-d8379e93f597b2ae6d1f7b4bb7e83fce commons-lang-2.1-src.tar.gz
+2ae988b339daec234019a7066f96733e commons-lang-2.3-src.tar.gz
More information about the fedora-extras-commits
mailing list