Compare commits
No commits in common. "rawhide" and "f32" have entirely different histories.
19 changed files with 1335 additions and 453 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,6 +1,3 @@
|
|||
velocity-1.6.3.tar.gz
|
||||
/velocity-1.6.4.tar.gz
|
||||
/velocity-1.7.tar.gz
|
||||
/velocity-1.7.pom
|
||||
/velocity-2.3.tar.gz
|
||||
/velocity-2.4.1.tar.gz
|
||||
|
|
|
|||
165
0001-Don-t-use-Werken-XPath.patch
Normal file
165
0001-Don-t-use-Werken-XPath.patch
Normal file
|
|
@ -0,0 +1,165 @@
|
|||
From 8a9344f55d74a5b809051ae144b3c028499fec0d Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Sat, 27 Sep 2013 10:53:46 +0200
|
||||
Subject: [PATCH] Don't use Werken XPath
|
||||
|
||||
---
|
||||
src/java/org/apache/velocity/anakia/AnakiaElement.java | 7 +++++--
|
||||
src/java/org/apache/velocity/anakia/NodeList.java | 6 ++++--
|
||||
src/java/org/apache/velocity/anakia/XPathCache.java | 9 ++++++---
|
||||
src/java/org/apache/velocity/anakia/XPathTool.java | 16 ++++++++++------
|
||||
4 files changed, 25 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/java/org/apache/velocity/anakia/AnakiaElement.java b/src/java/org/apache/velocity/anakia/AnakiaElement.java
|
||||
index c72b653..df13153 100644
|
||||
--- a/src/java/org/apache/velocity/anakia/AnakiaElement.java
|
||||
+++ b/src/java/org/apache/velocity/anakia/AnakiaElement.java
|
||||
@@ -20,8 +20,10 @@ package org.apache.velocity.anakia;
|
||||
*/
|
||||
|
||||
import org.jdom.Element;
|
||||
+import org.jdom.JDOMException;
|
||||
import org.jdom.Namespace;
|
||||
import org.jdom.output.XMLOutputter;
|
||||
+
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -126,10 +128,11 @@ public class AnakiaElement extends Element
|
||||
* @param xpathExpression the XPath expression you wish to apply
|
||||
* @return a NodeList representing the nodes that are the result of
|
||||
* application of the XPath to the current element. It can be empty.
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
- public NodeList selectNodes(String xpathExpression)
|
||||
+ public NodeList selectNodes(String xpathExpression) throws JDOMException
|
||||
{
|
||||
- return new NodeList(XPathCache.getXPath(xpathExpression).applyTo(this), false);
|
||||
+ return new NodeList(XPathCache.getXPath(xpathExpression).selectNodes(this), false);
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/src/java/org/apache/velocity/anakia/NodeList.java b/src/java/org/apache/velocity/anakia/NodeList.java
|
||||
index daf611d..b303bda 100644
|
||||
--- a/src/java/org/apache/velocity/anakia/NodeList.java
|
||||
+++ b/src/java/org/apache/velocity/anakia/NodeList.java
|
||||
@@ -35,6 +35,7 @@ import org.jdom.DocType;
|
||||
import org.jdom.Document;
|
||||
import org.jdom.Element;
|
||||
import org.jdom.EntityRef;
|
||||
+import org.jdom.JDOMException;
|
||||
import org.jdom.ProcessingInstruction;
|
||||
import org.jdom.Text;
|
||||
import org.jdom.output.XMLOutputter;
|
||||
@@ -289,10 +290,11 @@ public class NodeList implements List, Cloneable
|
||||
* @param xpathString the XPath expression you wish to apply
|
||||
* @return a NodeList representing the nodes that are the result of
|
||||
* application of the XPath to the current node list. It can be empty.
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
- public NodeList selectNodes(String xpathString)
|
||||
+ public NodeList selectNodes(String xpathString) throws JDOMException
|
||||
{
|
||||
- return new NodeList(XPathCache.getXPath(xpathString).applyTo(nodes), false);
|
||||
+ return new NodeList(XPathCache.getXPath(xpathString).selectNodes(nodes), false);
|
||||
}
|
||||
|
||||
// List methods implemented hereafter
|
||||
diff --git a/src/java/org/apache/velocity/anakia/XPathCache.java b/src/java/org/apache/velocity/anakia/XPathCache.java
|
||||
index cef43d9..0d633b0 100644
|
||||
--- a/src/java/org/apache/velocity/anakia/XPathCache.java
|
||||
+++ b/src/java/org/apache/velocity/anakia/XPathCache.java
|
||||
@@ -19,7 +19,9 @@ package org.apache.velocity.anakia;
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
-import com.werken.xpath.XPath;
|
||||
+import org.jdom.JDOMException;
|
||||
+import org.jdom.xpath.XPath;
|
||||
+
|
||||
import java.util.Map;
|
||||
import java.util.WeakHashMap;
|
||||
|
||||
@@ -46,8 +48,9 @@ class XPathCache
|
||||
* A cached object is returned if it already exists for the requested expression.
|
||||
* @param xpathString the XPath expression to parse
|
||||
* @return the XPath object that represents the parsed XPath expression.
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
- static XPath getXPath(String xpathString)
|
||||
+ static XPath getXPath(String xpathString) throws JDOMException
|
||||
{
|
||||
XPath xpath = null;
|
||||
synchronized(XPATH_CACHE)
|
||||
@@ -55,7 +58,7 @@ class XPathCache
|
||||
xpath = (XPath)XPATH_CACHE.get(xpathString);
|
||||
if(xpath == null)
|
||||
{
|
||||
- xpath = new XPath(xpathString);
|
||||
+ xpath = XPath.newInstance(xpathString);
|
||||
XPATH_CACHE.put(xpathString, xpath);
|
||||
}
|
||||
}
|
||||
diff --git a/src/java/org/apache/velocity/anakia/XPathTool.java b/src/java/org/apache/velocity/anakia/XPathTool.java
|
||||
index c9e6178..f85d2c1 100644
|
||||
--- a/src/java/org/apache/velocity/anakia/XPathTool.java
|
||||
+++ b/src/java/org/apache/velocity/anakia/XPathTool.java
|
||||
@@ -23,6 +23,7 @@ import java.util.List;
|
||||
|
||||
import org.jdom.Document;
|
||||
import org.jdom.Element;
|
||||
+import org.jdom.JDOMException;
|
||||
|
||||
/**
|
||||
* This class adds an entrypoint into XPath functionality,
|
||||
@@ -88,12 +89,13 @@ public class XPathTool
|
||||
* @param doc The Document context
|
||||
*
|
||||
* @return A list of selected nodes
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
public NodeList applyTo(String xpathSpec,
|
||||
- Document doc)
|
||||
+ Document doc) throws JDOMException
|
||||
{
|
||||
//RuntimeSingleton.info("XPathTool::applyTo(String, Document)");
|
||||
- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( doc ), false);
|
||||
+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( doc ), false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -103,12 +105,13 @@ public class XPathTool
|
||||
* @param elem The Element context
|
||||
*
|
||||
* @return A list of selected nodes
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
public NodeList applyTo(String xpathSpec,
|
||||
- Element elem)
|
||||
+ Element elem) throws JDOMException
|
||||
{
|
||||
//RuntimeSingleton.info("XPathTool::applyTo(String, Element)");
|
||||
- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( elem ), false);
|
||||
+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( elem ), false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -118,12 +121,13 @@ public class XPathTool
|
||||
* @param nodeSet The nodeset context
|
||||
*
|
||||
* @return A list of selected nodes
|
||||
+ * @throws JDOMException
|
||||
*/
|
||||
public NodeList applyTo(String xpathSpec,
|
||||
- List nodeSet)
|
||||
+ List nodeSet) throws JDOMException
|
||||
{
|
||||
//RuntimeSingleton.info("XPathTool::applyTo(String, List)");
|
||||
- return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( nodeSet ), false);
|
||||
+ return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( nodeSet ), false);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
62
0001-Remove-avalon-logkit.patch
Normal file
62
0001-Remove-avalon-logkit.patch
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
From 1d2f89cb3e954b943751fa8dd587fdb404eb9338 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Mon, 21 Feb 2011 15:53:34 +0100
|
||||
Subject: [PATCH 1/3] Remove avalon-logkit
|
||||
|
||||
we don't have it packaged so change defaults and remove it from pom.xml
|
||||
---
|
||||
pom.xml | 6 ------
|
||||
.../velocity/runtime/defaults/velocity.properties | 4 ++--
|
||||
.../apache/velocity/runtime/log/LogManager.java | 2 +-
|
||||
3 files changed, 3 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 77a8e38..f453208 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -197,12 +197,6 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
- <groupId>logkit</groupId>
|
||||
- <artifactId>logkit</artifactId>
|
||||
- <version>2.0</version>
|
||||
- <scope>provided</scope>
|
||||
- </dependency>
|
||||
- <dependency>
|
||||
<groupId>ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.6</version>
|
||||
diff --git a/src/java/org/apache/velocity/runtime/defaults/velocity.properties b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
||||
index 750a59a..7fac119 100644
|
||||
--- a/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
||||
+++ b/src/java/org/apache/velocity/runtime/defaults/velocity.properties
|
||||
@@ -20,10 +20,10 @@
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
-# default LogChute to use: default: AvalonLogChute, Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
|
||||
+# default LogChute to use: default: Log4JLogChute, CommonsLogLogChute, ServletLogChute, JdkLogChute
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
-runtime.log.logsystem.class = org.apache.velocity.runtime.log.AvalonLogChute,org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
|
||||
+runtime.log.logsystem.class = org.apache.velocity.runtime.log.Log4JLogChute,org.apache.velocity.runtime.log.CommonsLogLogChute,org.apache.velocity.runtime.log.ServletLogChute,org.apache.velocity.runtime.log.JdkLogChute
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# This is the location of the Velocity Runtime log.
|
||||
diff --git a/src/java/org/apache/velocity/runtime/log/LogManager.java b/src/java/org/apache/velocity/runtime/log/LogManager.java
|
||||
index 19d1016..97dceef 100644
|
||||
--- a/src/java/org/apache/velocity/runtime/log/LogManager.java
|
||||
+++ b/src/java/org/apache/velocity/runtime/log/LogManager.java
|
||||
@@ -119,7 +119,7 @@ public class LogManager
|
||||
* classes, and we use the first one we find.
|
||||
*
|
||||
* Note that the default value of this property contains the
|
||||
- * AvalonLogChute, the Log4JLogChute, CommonsLogLogChute,
|
||||
+ * Log4JLogChute, CommonsLogLogChute,
|
||||
* ServletLogChute, and the JdkLogChute for
|
||||
* convenience - so we use whichever we works first.
|
||||
*/
|
||||
--
|
||||
1.7.4
|
||||
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
From 4275860ed4a69047f783f0c06004ba4f1256a994 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 23 Aug 2023 08:49:53 +0200
|
||||
Subject: [PATCH] Template is a reserved keyword in javacc
|
||||
|
||||
Forwarded: no
|
||||
---
|
||||
velocity-engine-core/src/main/parser/Parser.jjt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
|
||||
index 4e790735..50c0ebac 100644
|
||||
--- a/velocity-engine-core/src/main/parser/Parser.jjt
|
||||
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
|
||||
@@ -234,12 +234,12 @@ public class ${parser.basename}Parser implements Parser
|
||||
* the new stream that we want parsed.
|
||||
*/
|
||||
@Override
|
||||
- public SimpleNode parse( Reader reader, Template t )
|
||||
+ public SimpleNode parse( Reader reader, Template tmplate )
|
||||
throws ParseException
|
||||
{
|
||||
SimpleNode sn = null;
|
||||
|
||||
- currentTemplate = t;
|
||||
+ currentTemplate = tmplate;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -267,7 +267,7 @@ public class ${parser.basename}Parser implements Parser
|
||||
* thrown by the Macro class when something is amiss in the
|
||||
* Macro specification
|
||||
*/
|
||||
- log.error("{}: {}", t.getName(), mee.getMessage(), mee);
|
||||
+ log.error("{}: {}", tmplate.getName(), mee.getMessage(), mee);
|
||||
throw mee;
|
||||
}
|
||||
catch (ParseException pe)
|
||||
@@ -282,7 +282,7 @@ public class ${parser.basename}Parser implements Parser
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
- String msg = t.getName() + ": " + e.getMessage();
|
||||
+ String msg = tmplate.getName() + ": " + e.getMessage();
|
||||
log.error(msg, e);
|
||||
throw new VelocityException(msg, e, getRuntimeServices().getLogContext().getStackTrace());
|
||||
}
|
||||
--
|
||||
2.52.0
|
||||
|
||||
197
0003-Use-system-jars.patch
Normal file
197
0003-Use-system-jars.patch
Normal file
|
|
@ -0,0 +1,197 @@
|
|||
From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Mon, 21 Feb 2011 17:58:39 +0100
|
||||
Subject: [PATCH 3/3] Use system jars
|
||||
|
||||
---
|
||||
build/build.xml | 56 +++++++++++----------------------------------------
|
||||
build/testcases.xml | 6 -----
|
||||
2 files changed, 12 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/build/build.xml b/build/build.xml
|
||||
index c667553..479ef2d 100644
|
||||
--- a/build/build.xml
|
||||
+++ b/build/build.xml
|
||||
@@ -140,28 +140,6 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- sets up the build environment (classpath and libs) -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="build-prepare">
|
||||
- <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />
|
||||
-
|
||||
- <!-- Build classpath -->
|
||||
- <path id="velocity.build.classpath">
|
||||
- <fileset dir="${build.lib}">
|
||||
- <include name="**/*.jar"/>
|
||||
- </fileset>
|
||||
- </path>
|
||||
-
|
||||
- <!-- Test classpath, contains dependencies needed only for Testing -->
|
||||
- <path id="velocity.test.classpath">
|
||||
- <fileset dir="${build.test.lib}">
|
||||
- <include name="**/*.jar"/>
|
||||
- </fileset>
|
||||
- </path>
|
||||
-
|
||||
- <path id="velocity.run.classpath">
|
||||
- <path refid="velocity.build.classpath"/>
|
||||
- <pathelement location="${build.dir}/${final.name}.jar"/>
|
||||
- </path>
|
||||
- </target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- checks for the existence/non-existence of various java features -->
|
||||
@@ -174,12 +152,11 @@
|
||||
<target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>
|
||||
<target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>
|
||||
|
||||
- <target name="check-jdbc" depends="build-prepare">
|
||||
+ <target name="check-jdbc">
|
||||
<!-- note: check to see if required class is available. -->
|
||||
<!-- might be j2ee.jar, jdbc2_0-stdext.jar, or simply JDK 1.4+ -->
|
||||
<available classname="javax.sql.DataSource"
|
||||
property="jdbc.present">
|
||||
- <classpath refid="velocity.build.classpath"/>
|
||||
</available>
|
||||
</target>
|
||||
|
||||
@@ -210,10 +187,9 @@
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
- <target name="check-jdk14" depends="build-prepare">
|
||||
+ <target name="check-jdk14">
|
||||
<available classname="java.util.logging.Logger"
|
||||
property="jdk14.present">
|
||||
- <classpath refid="velocity.build.classpath"/>
|
||||
</available>
|
||||
</target>
|
||||
|
||||
@@ -248,7 +224,7 @@
|
||||
<!-- =================================================================== -->
|
||||
<target name="compile" depends="compile-src,compile-test"/>
|
||||
|
||||
- <target name="compile-src" depends="prepare,build-prepare,check-jdbc,check-jdk14"
|
||||
+ <target name="compile-src" depends="prepare,check-jdbc,check-jdk14"
|
||||
description="Compiles the Velocity source">
|
||||
<javac srcdir="${build.src}"
|
||||
destdir="${build.dest}"
|
||||
@@ -257,8 +233,7 @@
|
||||
target="${javac.target}"
|
||||
source="${javac.source}"
|
||||
deprecation="${deprecation}"
|
||||
- optimize="${optimize}"
|
||||
- classpathref="velocity.build.classpath"/>
|
||||
+ optimize="${optimize}"/>
|
||||
|
||||
<copy todir="${build.dest}" filtering="yes">
|
||||
<fileset dir="${src.java.dir}">
|
||||
@@ -268,7 +243,7 @@
|
||||
|
||||
</target>
|
||||
|
||||
- <target name="compile-test" depends="prepare,build-prepare,compile-src"
|
||||
+ <target name="compile-test" depends="prepare,compile-src"
|
||||
description="Compiles the Velocity test classes">
|
||||
<javac srcdir="${build.test.src}"
|
||||
destdir="${build.test.dest}"
|
||||
@@ -279,8 +254,6 @@
|
||||
|
||||
<!-- Don't use the run classpath, build using the exploded class tree -->
|
||||
<classpath>
|
||||
- <path refid="velocity.build.classpath"/>
|
||||
- <path refid="velocity.test.classpath" />
|
||||
<pathelement location="${build.dest}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
@@ -561,7 +534,7 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- Compiles the example code -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="examples" depends="build-prepare,jar"
|
||||
+ <target name="examples"
|
||||
description="Compiles the Velocity Example code">
|
||||
|
||||
<echo>
|
||||
@@ -585,8 +558,7 @@
|
||||
encoding="UTF-8"
|
||||
debug="${debug}"
|
||||
deprecation="${deprecation}"
|
||||
- optimize="${optimize}"
|
||||
- classpathref="velocity.run.classpath"/>
|
||||
+ optimize="${optimize}"/>
|
||||
</target>
|
||||
|
||||
<target name="examples-clean" depends="examples-clean-anakia">
|
||||
@@ -604,7 +576,7 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- Creates the API documentation -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="javadocs" depends="prepare,build-prepare"
|
||||
+ <target name="javadocs" depends="prepare"
|
||||
description="Creates the Javadoc API documentation">
|
||||
|
||||
<mkdir dir="${build.javadoc}"/>
|
||||
@@ -620,8 +592,7 @@
|
||||
doctitle="${name} ${version} API"
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
- bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."
|
||||
- classpathref="velocity.build.classpath">
|
||||
+ bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">
|
||||
|
||||
<link href="${javadocs.ref.jsdk}"/>
|
||||
<link href="http://www.jdom.org/docs/apidocs"/>
|
||||
@@ -1024,12 +995,11 @@
|
||||
<!-- Make HTML version of Velocity documentation -->
|
||||
<!-- =================================================================== -->
|
||||
|
||||
- <target name="docs" depends="build-prepare,jar"
|
||||
+ <target name="docs" depends="jar"
|
||||
description="Generates the Velocity HTML documentation">
|
||||
|
||||
<taskdef name="anakia"
|
||||
- classname="org.apache.velocity.anakia.AnakiaTask"
|
||||
- classpathref="velocity.run.classpath"/>
|
||||
+ classname="org.apache.velocity.anakia.AnakiaTask"/>
|
||||
|
||||
<echo>
|
||||
#######################################################
|
||||
@@ -1231,7 +1201,7 @@
|
||||
<!-- =================================================================== -->
|
||||
<!-- JUnit Tests for Velocity -->
|
||||
<!-- =================================================================== -->
|
||||
- <target name="test-main" depends="build-prepare,compile-test"
|
||||
+ <target name="test-main" depends="compile-test"
|
||||
description="Run the Velocity testcases">
|
||||
|
||||
<!-- Require ant 1.7+ for Junit compatibility -->
|
||||
@@ -1264,8 +1234,6 @@
|
||||
|
||||
<!-- Don't use the run classpath, test using the exploded class tree -->
|
||||
<classpath>
|
||||
- <path refid="velocity.build.classpath" />
|
||||
- <path refid="velocity.test.classpath" />
|
||||
<pathelement path="${build.dest}"/>
|
||||
<pathelement path="${build.test.dest}"/>
|
||||
</classpath>
|
||||
diff --git a/build/testcases.xml b/build/testcases.xml
|
||||
index 06bb36e..f3749bc 100644
|
||||
--- a/build/testcases.xml
|
||||
+++ b/build/testcases.xml
|
||||
@@ -36,12 +36,6 @@
|
||||
|
||||
<!-- Build classpath -->
|
||||
<path id="velocity.test.classpath">
|
||||
- <fileset dir="${build.lib}">
|
||||
- <include name="**/*.jar"/>
|
||||
- </fileset>
|
||||
- <fileset dir="${build.test.lib}">
|
||||
- <include name="**/*.jar"/>
|
||||
- </fileset>
|
||||
<pathelement location="${build.dest}"/>
|
||||
<pathelement location="${build.test.dest}"/>
|
||||
</path>
|
||||
--
|
||||
1.7.4
|
||||
|
||||
19
0004-JDBC-41-compat.patch
Normal file
19
0004-JDBC-41-compat.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
--- a/src/test/org/apache/velocity/test/sql/HsqlDataSource.java 2012-02-15 19:49:20.202936454 -0500
|
||||
+++ b/src/test/org/apache/velocity/test/sql/HsqlDataSource.java 2012-02-15 19:52:35.062574871 -0500
|
||||
@@ -23,6 +23,7 @@
|
||||
import java.sql.Connection;
|
||||
import java.sql.DriverManager;
|
||||
import java.sql.SQLException;
|
||||
+import java.sql.SQLFeatureNotSupportedException;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
@@ -73,5 +74,8 @@
|
||||
public Object unwrap(final Class iface) throws SQLException {
|
||||
throw new SQLException("Not implemented");
|
||||
}
|
||||
+ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
|
||||
+ throw new SQLFeatureNotSupportedException("getParentLogger() not supported");
|
||||
+ }
|
||||
|
||||
}
|
||||
25
0004-Use-log4j-1.2.17.patch
Normal file
25
0004-Use-log4j-1.2.17.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From cec42bf7ae8b4b72850c3cdea74a07603f11786f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 18 Jun 2014 07:25:12 +0200
|
||||
Subject: [PATCH 4/4] Use log4j 1.2.17
|
||||
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index e35d72d..c8d48fd 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -187,7 +187,7 @@
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
- <version>1.2.12</version>
|
||||
+ <version>1.2.17</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
--
|
||||
1.9.3
|
||||
|
||||
26
0006-Skip-Java-8-incompatible-test.patch
Normal file
26
0006-Skip-Java-8-incompatible-test.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From 6060e6ef497bddc4a9aeac343e584ff324746d58 Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 18 Jun 2014 08:11:48 +0200
|
||||
Subject: [PATCH 6/6] Skip Java 8 incompatible test
|
||||
|
||||
---
|
||||
src/test/org/apache/velocity/test/issues/VelTools66TestCase.java | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java b/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
|
||||
index 00bb0b1..6fb7260 100644
|
||||
--- a/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
|
||||
+++ b/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
|
||||
@@ -87,7 +87,8 @@ public class VelTools66TestCase
|
||||
|
||||
Method testMethod = introspector.getMethod(TestObject.class, "getTestValue", new Object[0]);
|
||||
assertNotNull(testMethod);
|
||||
- assertEquals("Method object does not match!", verifyMethod, testMethod);
|
||||
+ // Java 8 incompatibility
|
||||
+ // assertEquals("Method object does not match!", verifyMethod, testMethod);
|
||||
}
|
||||
|
||||
public static interface TestInterface
|
||||
--
|
||||
1.9.3
|
||||
|
||||
339
changelog
339
changelog
|
|
@ -1,339 +0,0 @@
|
|||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-6
|
||||
- Switch to a newer patch macro syntax
|
||||
|
||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.3-5
|
||||
- Rebuilt for java-21-openjdk as system jdk
|
||||
|
||||
* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.3-4
|
||||
- bump of release for for java-21-openjdk as system jdk
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-2
|
||||
- Convert License tag to SPDX format
|
||||
|
||||
* Fri Aug 25 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-1
|
||||
- Update to upstream version 2.3
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.7-38
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-35
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Sep 11 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-33
|
||||
- Default to JDK logging and drop commons-logging and log4j12 implementations.
|
||||
|
||||
* Thu Jul 30 2020 Fabio Valentini <decathorpe@gmail.com> - 0:1.7-32
|
||||
- Port to commons-lang3.
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 14 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-30
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Mon Jul 13 2020 Mat Booth <mat.booth@redhat.com> - 0:1.7-29
|
||||
- Ignore test case that fails on Java 11
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.7-28
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-27
|
||||
- Build with Maven
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-26
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-25
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7-24
|
||||
- Repack the tarball without binaries
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:1.7-20
|
||||
- Add hsqldb conditional
|
||||
- Switch to glassfish-servlet-api
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2015 gil cattaneo <puntogil@libero.it> 0:1.7-18
|
||||
- fix FTBFS rhbz#1240035
|
||||
- fix BR list, change log4j with log4j12
|
||||
- set javac source/target to 1.6
|
||||
- disable Java8doc doclint
|
||||
- remove werken-xpath Import/Export refences in manifest file
|
||||
- resolve some rpmlint problems
|
||||
- remove zero-length file
|
||||
- introduce license macro
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-16
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Thu Sep 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-15
|
||||
- Require hsqldb-lib instead of hsqldb
|
||||
|
||||
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-14
|
||||
- Apply patch for log4j 1.2.17
|
||||
|
||||
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-13
|
||||
- Use log4j 1.2 compat package
|
||||
- Skip Java 8 incompatible test
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-11
|
||||
- Use .mfiles generated during build
|
||||
|
||||
* Sat Sep 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-10
|
||||
- Port from werken-xpath to jdom
|
||||
- Resolves: rhbz#875817
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 0:1.7-9
|
||||
- Fix FTBFS (Resolves: #992852)
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-6
|
||||
- Install NOTICE files
|
||||
- Resolves: rhbz#879021
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-4
|
||||
- Use new tomcat-servlet-api
|
||||
- Update to latest guidelines
|
||||
|
||||
* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 0:1.7-3
|
||||
- Resolved rhbz#791045
|
||||
- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-1
|
||||
- Update to latest version
|
||||
- Drop old patches
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
|
||||
- Add compatibility depmap
|
||||
|
||||
* Wed Nov 3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
|
||||
- Rebase to latest upstream
|
||||
- Fix problems from bz#226525
|
||||
|
||||
* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
|
||||
- Use apache-commons-collections instead of jakarta name
|
||||
- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
|
||||
|
||||
* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
|
||||
- Fix BR/R for jakarta-commons-rename.
|
||||
|
||||
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
|
||||
- Get (Build)Requires right
|
||||
|
||||
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-2
|
||||
- Require all of the packages in the POM
|
||||
- Add dist to version
|
||||
|
||||
* Fri Jan 15 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-1
|
||||
- Update to 1.6.3
|
||||
- Remove dependency on avalon-logkit
|
||||
- Add maven metadata and pom
|
||||
|
||||
* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
|
||||
- Drop gcj_support.
|
||||
- Fix groups and url.
|
||||
- Use upstream tarball.
|
||||
|
||||
* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
|
||||
- Convert specfile to UTF-8.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-9.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Apr 24 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.4-8.4
|
||||
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7.3
|
||||
- drop repotag
|
||||
|
||||
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7jpp.2
|
||||
- fix license tag
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.4-7jpp.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
|
||||
- Resync with latest from JPP.
|
||||
- Partially adopt new naming convention.
|
||||
|
||||
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
|
||||
- Rebuilt
|
||||
|
||||
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_1fc
|
||||
- Merge with latest from JPP.
|
||||
- Remove fileversion and my_version macros.
|
||||
- Remove notexentests patch and replace with a patch to disable
|
||||
- failure on tests.
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.4-3jpp_8fc
|
||||
- Rebuilt
|
||||
|
||||
* Tue Jul 18 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.4-3jpp_7fc
|
||||
- Build on all archs.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_6fc
|
||||
- rebuild
|
||||
|
||||
* Wed Mar 8 2006 Rafael Schloming <rafaels@redhat.com> - 0:1.4-3jpp_5fc
|
||||
- excluded s390[x] and ppc64 due to eclipse
|
||||
|
||||
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.4-3jpp_4fc
|
||||
- stop scriptlet spew
|
||||
|
||||
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_3fc
|
||||
- rebuilt again
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_2fc
|
||||
- rebuilt
|
||||
|
||||
* Tue Nov 8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.4-3jpp_1fc
|
||||
- Converted from ISO-8859-1 to UTF-8
|
||||
|
||||
* Wed Jun 15 2005 Gary Benson <gbenson@redhat.com> 0:1.4-3jpp_1fc
|
||||
- Build into Fedora.
|
||||
|
||||
* Thu Jun 9 2005 Gary Benson <gbenson@redhat.com>
|
||||
- Remove jarfiles from the tarball.
|
||||
|
||||
* Mon Jun 6 2005 Gary Benson <gbenson@redhat.com>
|
||||
- Build with servletapi5.
|
||||
- Add NOTICE file as per Apache License version 2.0.
|
||||
- Skip some failing tests.
|
||||
|
||||
* Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
|
||||
- First Red Hat build
|
||||
|
||||
* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
|
||||
- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
|
||||
by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
|
||||
as well as using org.jdom.output.Format in AnakiaTask.java
|
||||
- Therefore require jdom >= 0:1.0-1
|
||||
|
||||
* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
|
||||
- Build with ant-1.6.2
|
||||
|
||||
* Mon Jun 07 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-1jpp
|
||||
- 1.4 final
|
||||
- Patch #0 is unnecessary (upstream)
|
||||
- We have to build velocity against servletapi3
|
||||
|
||||
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
|
||||
- Fix a few jpackage related .spec typos, oops.
|
||||
|
||||
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp
|
||||
- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
|
||||
build problems.
|
||||
|
||||
* Sun May 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.1-2jpp
|
||||
- Add Epochs to dependencies.
|
||||
- Add explicit defattrs.
|
||||
- Add non-versioned javadoc symlinks.
|
||||
- Use sed instead of bash 2 extension when symlinking jars during build.
|
||||
- Use full URL in Source.
|
||||
- Fix -javadoc Group tag.
|
||||
- Drop patch in favour of ant options.
|
||||
- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).
|
||||
|
||||
* Sat May 24 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3.1-1jpp
|
||||
- 1.3.1 stable release
|
||||
|
||||
* Fri May 23 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3-1jpp
|
||||
- 1.3 stable release
|
||||
- Updated for JPackage 1.5
|
||||
- Run JUnit regression tests as part of the build process
|
||||
- Added patch file to fix test case classpath for JUnit standard locations
|
||||
|
||||
* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
|
||||
- 1.3.0rc1
|
||||
- dropped patch
|
||||
- versioned dir for javadoc
|
||||
- no dependencies for manual and javadoc packages
|
||||
- stricter dependency for demo package
|
||||
|
||||
* Wed Dec 12 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-1jpp
|
||||
- 1.2
|
||||
- regenerated patch and corrected manifest
|
||||
- requires and buildrequires jdom >= 1.0-0.b7.1
|
||||
|
||||
* Wed Dec 5 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-4jpp
|
||||
- javadoc into javadoc package
|
||||
|
||||
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.1-3jpp
|
||||
- removed packager tag
|
||||
- new jpp extension
|
||||
|
||||
* Thu Nov 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-2jpp
|
||||
- first unified release
|
||||
- s/jPackage/JPackage
|
||||
|
||||
* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-1jpp
|
||||
- first Mandrake release
|
||||
1
ci.fmf
1
ci.fmf
|
|
@ -1 +0,0 @@
|
|||
resultsdb-testcase: separate
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_testing
|
||||
- bodhi_update_push_stable
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
|
||||
21
generate-tarball.sh
Executable file
21
generate-tarball.sh
Executable file
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
name=velocity
|
||||
version="$(sed -n 's/Version:\s*//p' *.spec)"
|
||||
|
||||
# RETRIEVE
|
||||
wget "http://www.apache.org/dist/${name}/engine/${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
|
||||
|
||||
rm -rf tarball-tmp
|
||||
mkdir tarball-tmp
|
||||
cd tarball-tmp
|
||||
tar xf "../${name}-${version}.orig.tar.gz"
|
||||
|
||||
# CLEAN TARBALL
|
||||
rm -r */*.jar
|
||||
rm -r */lib
|
||||
|
||||
tar cf "../${name}-${version}.tar.gz" *
|
||||
cd ..
|
||||
rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
summary: Run javapackages-specific tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
|
||||
ref: f43
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (velocity-2.4.1.tar.gz) = 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
|
||||
SHA512 (velocity-1.7.tar.gz) = d305642aab3c837ad250deaa46b516561fb68f92d04fc205fd4f40eb774ba6286ed3b239ee6352bc4411bd11cb4d1d5b39ce9ab8467f0e1ffceed9f9fc5a228d
|
||||
|
|
|
|||
11
velocity-1.7-doclint.patch
Normal file
11
velocity-1.7-doclint.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -Nru velocity-1.7/build/build.xml velocity-1.7.doclint/build/build.xml
|
||||
--- velocity-1.7/build/build.xml 2015-07-22 12:13:51.566920750 +0200
|
||||
+++ velocity-1.7.doclint/build/build.xml 2015-07-22 12:13:14.929703544 +0200
|
||||
@@ -592,6 +592,7 @@
|
||||
doctitle="${name} ${version} API"
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
+ additionalparam="-Xdoclint:none"
|
||||
bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">
|
||||
|
||||
<link href="${javadocs.ref.jsdk}"/>
|
||||
43
velocity-1.7-osgi.patch
Normal file
43
velocity-1.7-osgi.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
diff -Nru velocity-1.7/build/build.properties velocity-1.7.osgi/build/build.properties
|
||||
--- velocity-1.7/build/build.properties 2010-11-19 21:16:21.000000000 +0100
|
||||
+++ velocity-1.7.osgi/build/build.properties 2015-07-22 12:21:19.627117810 +0200
|
||||
@@ -166,8 +166,7 @@
|
||||
|
||||
########################################################################
|
||||
# OSGi stuff
|
||||
-import=com.werken.xpath;resolution:=optional,\
|
||||
- javax.naming,\
|
||||
+import=javax.naming,\
|
||||
javax.servlet;resolution:=optional,\
|
||||
javax.servlet.http;resolution:=optional,\
|
||||
javax.sql,\
|
||||
@@ -188,8 +187,7 @@
|
||||
org.jdom.input;resolution:=optional,\
|
||||
org.jdom.output;resolution:=optional,\
|
||||
org.xml.sax
|
||||
-dep.import=com.werken.xpath;resolution:=optional,\
|
||||
- javax.naming,\
|
||||
+dep.import=javax.naming,\
|
||||
javax.servlet;resolution:=optional,\
|
||||
javax.servlet.http;resolution:=optional,\
|
||||
javax.sql,\
|
||||
@@ -207,8 +205,7 @@
|
||||
export=org.apache.velocity;uses:="org.apache.velocity.context,\
|
||||
org.apache.velocity.exception,\
|
||||
org.apache.velocity.runtime.resource",\
|
||||
- org.apache.velocity.anakia;uses:="com.werken.xpath,\
|
||||
- org.apache.tools.ant,\
|
||||
+ org.apache.velocity.anakia;uses:="org.apache.tools.ant,\
|
||||
org.apache.tools.ant.taskdefs,\
|
||||
org.jdom,\
|
||||
org.jdom.output",\
|
||||
@@ -327,8 +324,7 @@
|
||||
org.apache.velocity;uses:="org.apache.velocity.context,\
|
||||
org.apache.velocity.exception,\
|
||||
org.apache.velocity.runtime.resource",\
|
||||
- org.apache.velocity.anakia;uses:="com.werken.xpath,\
|
||||
- org.apache.tools.ant,\
|
||||
+ org.apache.velocity.anakia;uses:="org.apache.tools.ant,\
|
||||
org.apache.tools.ant.taskdefs,\
|
||||
org.jdom,\
|
||||
org.jdom.output",\
|
||||
346
velocity-1.7.pom
Normal file
346
velocity-1.7.pom
Normal file
|
|
@ -0,0 +1,346 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>apache</artifactId>
|
||||
<version>4</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.apache.velocity</groupId>
|
||||
<artifactId>velocity</artifactId>
|
||||
<version>1.7</version>
|
||||
|
||||
<name>Apache Velocity</name>
|
||||
<url>http://velocity.apache.org/engine/devel/</url>
|
||||
<description>Apache Velocity is a general purpose template engine.</description>
|
||||
<inceptionYear>2000</inceptionYear>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<prerequisites>
|
||||
<maven>2.0.9</maven>
|
||||
</prerequisites>
|
||||
|
||||
<build>
|
||||
<defaultGoal>install</defaultGoal>
|
||||
<sourceDirectory>src/java</sourceDirectory>
|
||||
<testSourceDirectory>src/test</testSourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<configuration>
|
||||
<inputEncoding>UTF-8</inputEncoding>
|
||||
<outputEncoding>UTF-8</outputEncoding>
|
||||
<xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/java</directory>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
</build>
|
||||
|
||||
<distributionManagement>
|
||||
<site>
|
||||
<id>velocity.apache.org</id>
|
||||
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7</url>
|
||||
</site>
|
||||
<repository>
|
||||
<id>apache.releases</id>
|
||||
<name>Apache Release Distribution Repository</name>
|
||||
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>apache.snapshots</id>
|
||||
<name>Apache Development Snapshot Repository</name>
|
||||
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Will Glass-Husain</name>
|
||||
<id>wglass</id>
|
||||
<email>wglass@forio.com</email>
|
||||
<organization>Forio Business Simulations</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
|
||||
<developer>
|
||||
<name>Geir Magnusson Jr.</name>
|
||||
<id>geirm</id>
|
||||
<email>geirm@optonline.net</email>
|
||||
<organization>Independent (DVSL Maven)</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
|
||||
<developer>
|
||||
<name>Daniel Rall</name>
|
||||
<id>dlr</id>
|
||||
<email>dlr@finemaltcoding.com</email>
|
||||
<organization>CollabNet, Inc.</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
|
||||
<developer>
|
||||
<name>Henning P. Schmiedehausen</name>
|
||||
<id>henning</id>
|
||||
<email>hps@intermeta.de</email>
|
||||
<organization>INTERMETA - Gesellschaft für Mehrwertdienste mbH</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
<timezone>2</timezone>
|
||||
</developer>
|
||||
|
||||
<developer>
|
||||
<name>Nathan Bubna</name>
|
||||
<id>nbubna</id>
|
||||
<email>nathan@esha.com</email>
|
||||
<organization>ESHA Research</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
|
||||
</developers>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-collections</groupId>
|
||||
<artifactId>commons-collections</artifactId>
|
||||
<version>3.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>oro</groupId>
|
||||
<artifactId>oro</artifactId>
|
||||
<version>2.0.8</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jdom</groupId>
|
||||
<artifactId>jdom</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.1</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>avalon-framework</groupId>
|
||||
<artifactId>avalon-framework</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.12</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>2.3</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>logkit</groupId>
|
||||
<artifactId>logkit</artifactId>
|
||||
<version>2.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.6</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>werken-xpath</groupId>
|
||||
<artifactId>werken-xpath</artifactId>
|
||||
<version>0.9.4</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>hsqldb</groupId>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
<report>dependencies</report>
|
||||
<report>issue-tracking</report>
|
||||
<report>license</report>
|
||||
<report>summary</report>
|
||||
<report>scm</report>
|
||||
</reports>
|
||||
</reportSet>
|
||||
</reportSets>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-changes-plugin</artifactId>
|
||||
<version>2.0</version>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
<report>changes-report</report>
|
||||
<report>jira-report</report>
|
||||
</reports>
|
||||
</reportSet>
|
||||
</reportSets>
|
||||
<configuration>
|
||||
<issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
|
||||
<!-- Apache JIRA, Component Engine -->
|
||||
<component>12311337</component>
|
||||
<!-- FixFor 1.6 -->
|
||||
<filter>fixfor=12310290&sorter/field=issuekey&sorter/order=ASC</filter>
|
||||
<maxEntries>100</maxEntries>
|
||||
<teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>taglist-maven-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
<configuration>
|
||||
<tag>TODO</tag>
|
||||
<tag>FIXME</tag>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jxr-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.5</version>
|
||||
<configuration>
|
||||
<links>
|
||||
<link>http://java.sun.com/j2se/1.4.2/docs/api</link>
|
||||
<link>http://jakarta.apache.org/oro/api</link>
|
||||
<link>http://jakarta.apache.org/commons/lang/api-release</link>
|
||||
<link>http://jakarta.apache.org/commons/collections/api-release</link>
|
||||
|
||||
<link>http://www.jdom.org/docs/apidocs</link>
|
||||
<link>http://logging.apache.org/log4j/docs/api</link>
|
||||
<link>http://excalibur.apache.org/apidocs</link>
|
||||
<link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi</link>
|
||||
</links>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-changelog-plugin</artifactId>
|
||||
<version>2.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>findbugs-maven-plugin</artifactId>
|
||||
<version>1.2</version>
|
||||
<configuration>
|
||||
<xmlOutput>true</xmlOutput>
|
||||
<threshold>Low</threshold>
|
||||
<effort>Max</effort>
|
||||
<excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
|
||||
<findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.4</source>
|
||||
<target>1.4</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
|
||||
<scm>
|
||||
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
|
||||
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
|
||||
<tag>HEAD</tag>
|
||||
<url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
<jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
|
||||
</properties>
|
||||
|
||||
<issueManagement>
|
||||
<system>JIRA</system>
|
||||
<url>${jira.browse.url}/VELOCITY</url>
|
||||
</issueManagement>
|
||||
</project>
|
||||
456
velocity.spec
456
velocity.spec
|
|
@ -1,32 +1,50 @@
|
|||
%bcond_with bootstrap
|
||||
%bcond_without hsqldb
|
||||
|
||||
Name: velocity
|
||||
Version: 2.4.1
|
||||
Release: %autorelease
|
||||
Version: 1.7
|
||||
Release: 27%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Java-based template engine
|
||||
License: Apache-2.0
|
||||
URL: https://velocity.apache.org
|
||||
License: ASL 2.0
|
||||
URL: http://velocity.apache.org/
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
Source0: https://github.com/apache/velocity-engine/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# ./generate-tarball.sh
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
|
||||
# Remove bundled binaries which cannot be easily verified for licensing
|
||||
Source2: generate-tarball.sh
|
||||
|
||||
Patch: 0001-Template-is-a-reserved-keyword-in-javacc.patch
|
||||
Patch0: 0001-Remove-avalon-logkit.patch
|
||||
Patch1: 0004-Use-log4j-1.2.17.patch
|
||||
Patch2: 0003-Use-system-jars.patch
|
||||
Patch3: 0004-JDBC-41-compat.patch
|
||||
Patch4: 0001-Don-t-use-Werken-XPath.patch
|
||||
Patch5: 0006-Skip-Java-8-incompatible-test.patch
|
||||
Patch6: velocity-1.7-doclint.patch
|
||||
Patch7: velocity-1.7-osgi.patch
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local-openjdk25
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: ant
|
||||
BuildRequires: antlr
|
||||
BuildRequires: junit
|
||||
BuildRequires: ant-junit
|
||||
%if %{with hsqldb}
|
||||
BuildRequires: hsqldb-lib
|
||||
%endif
|
||||
# TODO Remove in Fedora 46
|
||||
Obsoletes: %{name}-javadoc < 2.3-21
|
||||
BuildRequires: apache-commons-collections
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: glassfish-servlet-api
|
||||
BuildRequires: jakarta-oro
|
||||
BuildRequires: jaxen
|
||||
BuildRequires: jdom
|
||||
BuildRequires: bcel
|
||||
BuildRequires: log4j12
|
||||
BuildRequires: apache-parent
|
||||
|
||||
# It fails one of the arithmetic test cases with gcj
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
|
||||
%description
|
||||
Velocity is a Java-based template engine. It permits anyone to use the
|
||||
|
|
@ -49,39 +67,397 @@ template services for the Turbine web application framework.
|
|||
Velocity+Turbine provides a template service that will allow web
|
||||
applications to be developed according to a true MVC model.
|
||||
|
||||
%package manual
|
||||
Summary: Manual for %{name}
|
||||
|
||||
%description manual
|
||||
Documentation for %{name}.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
|
||||
%package demo
|
||||
Summary: Demo for %{name}
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description demo
|
||||
Demonstrations and samples for %{name}.
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -C
|
||||
%setup -q
|
||||
|
||||
%mvn_alias : velocity:velocity
|
||||
%mvn_alias : org.apache.velocity:velocity
|
||||
# remove bundled libs/classes (except those used for testing)
|
||||
find . -name '*.jar' ! -name 'test*.jar' -print -delete
|
||||
find . -name '*.class' ! -name 'Foo.class' -print -delete
|
||||
|
||||
%pom_remove_parent
|
||||
%pom_xpath_inject pom:project "<groupId>org.apache.velocity</groupId>"
|
||||
# Remove dependency on avalon-logkit
|
||||
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogChute.java
|
||||
rm -f src/java/org/apache/velocity/runtime/log/AvalonLogSystem.java
|
||||
rm -f src/java/org/apache/velocity/runtime/log/VelocityFormatter.java
|
||||
|
||||
%pom_disable_module spring-velocity-support
|
||||
%pom_disable_module velocity-custom-parser-example
|
||||
%pom_disable_module velocity-engine-examples
|
||||
%pom_disable_module velocity-engine-scripting
|
||||
# need porting to new servlet API. We would just add a lot of empty functions
|
||||
rm src/test/org/apache/velocity/test/VelocityServletTestCase.java
|
||||
|
||||
%pom_remove_plugin :maven-javadoc-plugin
|
||||
# This test doesn't work with new hsqldb
|
||||
rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
|
||||
|
||||
%pom_remove_plugin :templating-maven-plugin velocity-engine-core
|
||||
sed 's/${project.version}/%{version}/' \
|
||||
velocity-engine-core/src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java \
|
||||
>velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java
|
||||
cp %{SOURCE1} ./pom.xml
|
||||
|
||||
# remove rest of avalon logkit refences
|
||||
%patch0 -p1
|
||||
|
||||
%pom_xpath_remove "pom:dependency[pom:scope='test']" velocity-engine-core
|
||||
# Use log4j 1.2.17
|
||||
%patch1 -p1
|
||||
|
||||
# Use system jar files instead of downloading from net
|
||||
%patch2 -p1
|
||||
|
||||
%patch3 -p1
|
||||
|
||||
# Use jdom instead of werken-xpath
|
||||
%patch4 -p1
|
||||
%pom_remove_dep werken-xpath:
|
||||
|
||||
# Skip Java 8 incompatible test
|
||||
%patch5 -p1
|
||||
|
||||
# Disable Java8 doclint
|
||||
%patch6 -p1
|
||||
|
||||
# Remove werken-xpath Import/Export refences in OSGi manifest file
|
||||
%patch7 -p1
|
||||
|
||||
%if %{without hsqldb}
|
||||
rm -r src/test/org/apache/velocity/test/sql
|
||||
%endif
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%build
|
||||
%mvn_build -j -f
|
||||
|
||||
export CLASSPATH=$(build-classpath \
|
||||
antlr \
|
||||
apache-commons-collections \
|
||||
commons-lang \
|
||||
commons-logging \
|
||||
glassfish-servlet-api \
|
||||
junit \
|
||||
jakarta-oro \
|
||||
log4j:log4j:1.2.17 \
|
||||
jaxen \
|
||||
jdom \
|
||||
bcel \
|
||||
hsqldb \
|
||||
junit)
|
||||
ant \
|
||||
-buildfile build/build.xml \
|
||||
-Dbuild.sysclasspath=first \
|
||||
-Djavac.target=1.6 \
|
||||
-Djavac.source=1.6 \
|
||||
jar javadocs test
|
||||
|
||||
# fix line-endings in generated files
|
||||
sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
%mvn_file : %{name}
|
||||
%mvn_alias : %{name}:%{name}
|
||||
%mvn_artifact pom.xml bin/%{name}-%{version}.jar
|
||||
%mvn_install -J docs/api
|
||||
|
||||
# zero-length file
|
||||
rm -r test/issues/velocity-537/compare/velocity537.vm.cmp
|
||||
# data
|
||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr examples test %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
|
||||
%files -f .mfiles
|
||||
%doc README.md
|
||||
%doc README.txt
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files manual
|
||||
%license LICENSE NOTICE
|
||||
%doc docs/*
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files demo
|
||||
%license LICENSE NOTICE
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7-24
|
||||
- Repack the tarball without binaries
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 0:1.7-20
|
||||
- Add hsqldb conditional
|
||||
- Switch to glassfish-servlet-api
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.7-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2015 gil cattaneo <puntogil@libero.it> 0:1.7-18
|
||||
- fix FTBFS rhbz#1240035
|
||||
- fix BR list, change log4j with log4j12
|
||||
- set javac source/target to 1.6
|
||||
- disable Java8doc doclint
|
||||
- remove werken-xpath Import/Export refences in manifest file
|
||||
- resolve some rpmlint problems
|
||||
- remove zero-length file
|
||||
- introduce license macro
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-16
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Thu Sep 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-15
|
||||
- Require hsqldb-lib instead of hsqldb
|
||||
|
||||
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-14
|
||||
- Apply patch for log4j 1.2.17
|
||||
|
||||
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-13
|
||||
- Use log4j 1.2 compat package
|
||||
- Skip Java 8 incompatible test
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-11
|
||||
- Use .mfiles generated during build
|
||||
|
||||
* Sat Sep 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-10
|
||||
- Port from werken-xpath to jdom
|
||||
- Resolves: rhbz#875817
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 0:1.7-9
|
||||
- Fix FTBFS (Resolves: #992852)
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7-6
|
||||
- Install NOTICE files
|
||||
- Resolves: rhbz#879021
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-4
|
||||
- Use new tomcat-servlet-api
|
||||
- Update to latest guidelines
|
||||
|
||||
* Fri Feb 17 2012 Deepak Bhole <dbhole@redhat.com> - 0:1.7-3
|
||||
- Resolved rhbz#791045
|
||||
- Added patch from Omaid Majid <omajid@redhat.com> to fix build with Java 7
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Feb 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.7-1
|
||||
- Update to latest version
|
||||
- Drop old patches
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.6.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Dec 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-2
|
||||
- Add compatibility depmap
|
||||
|
||||
* Wed Nov 3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.4-1
|
||||
- Rebase to latest upstream
|
||||
- Fix problems from bz#226525
|
||||
|
||||
* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.6.3-5
|
||||
- Use apache-commons-collections instead of jakarta name
|
||||
- Use tomcat6 for dependency instead of tomcat5 (bz#640660)
|
||||
|
||||
* Mon Jun 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.6.3-4
|
||||
- Fix BR/R for jakarta-commons-rename.
|
||||
|
||||
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-3
|
||||
- Get (Build)Requires right
|
||||
|
||||
* Sat Feb 13 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-2
|
||||
- Require all of the packages in the POM
|
||||
- Add dist to version
|
||||
|
||||
* Fri Jan 15 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.6.3-1
|
||||
- Update to 1.6.3
|
||||
- Remove dependency on avalon-logkit
|
||||
- Add maven metadata and pom
|
||||
|
||||
* Sun Jan 10 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-10.5
|
||||
- Drop gcj_support.
|
||||
- Fix groups and url.
|
||||
- Use upstream tarball.
|
||||
|
||||
* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 0:1.4-10.4
|
||||
- Convert specfile to UTF-8.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-9.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Apr 24 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0:1.4-8.4
|
||||
- Fix FTBFS: added velocity-enum.patch (enum is a reserved keyword in java >= 1.5)
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-8.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7.3
|
||||
- drop repotag
|
||||
|
||||
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:1.4-7jpp.2
|
||||
- fix license tag
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.4-7jpp.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Tue Aug 08 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-6jpp.1
|
||||
- Resync with latest from JPP.
|
||||
- Partially adopt new naming convention.
|
||||
|
||||
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_2fc
|
||||
- Rebuilt
|
||||
|
||||
* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.4-5jpp_1fc
|
||||
- Merge with latest from JPP.
|
||||
- Remove fileversion and my_version macros.
|
||||
- Remove notexentests patch and replace with a patch to disable
|
||||
- failure on tests.
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.4-3jpp_8fc
|
||||
- Rebuilt
|
||||
|
||||
* Tue Jul 18 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.4-3jpp_7fc
|
||||
- Build on all archs.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_6fc
|
||||
- rebuild
|
||||
|
||||
* Wed Mar 8 2006 Rafael Schloming <rafaels@redhat.com> - 0:1.4-3jpp_5fc
|
||||
- excluded s390[x] and ppc64 due to eclipse
|
||||
|
||||
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.4-3jpp_4fc
|
||||
- stop scriptlet spew
|
||||
|
||||
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_3fc
|
||||
- rebuilt again
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> - 0:1.4-3jpp_2fc
|
||||
- rebuilt
|
||||
|
||||
* Tue Nov 8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.4-3jpp_1fc
|
||||
- Converted from ISO-8859-1 to UTF-8
|
||||
|
||||
* Wed Jun 15 2005 Gary Benson <gbenson@redhat.com> 0:1.4-3jpp_1fc
|
||||
- Build into Fedora.
|
||||
|
||||
* Thu Jun 9 2005 Gary Benson <gbenson@redhat.com>
|
||||
- Remove jarfiles from the tarball.
|
||||
|
||||
* Mon Jun 6 2005 Gary Benson <gbenson@redhat.com>
|
||||
- Build with servletapi5.
|
||||
- Add NOTICE file as per Apache License version 2.0.
|
||||
- Skip some failing tests.
|
||||
|
||||
* Mon Oct 18 2004 Fernando Nasser <fnasser@redhat.com> 0:1.4-3jpp_1rh
|
||||
- First Red Hat build
|
||||
|
||||
* Thu Sep 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-3jpp
|
||||
- Adapt to jdom-1.0-1 replacing org.jdom.input.DefaultJDOMFactory
|
||||
by org.jdom.DefaultJDOMFactory in AnakiaJDOMFactory.java
|
||||
as well as using org.jdom.output.Format in AnakiaTask.java
|
||||
- Therefore require jdom >= 0:1.0-1
|
||||
|
||||
* Thu Sep 02 2004 Ralph Apel <r.apel at r-apel.de> 0:1.4-2jpp
|
||||
- Build with ant-1.6.2
|
||||
|
||||
* Mon Jun 07 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-1jpp
|
||||
- 1.4 final
|
||||
- Patch #0 is unnecessary (upstream)
|
||||
- We have to build velocity against servletapi3
|
||||
|
||||
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.2jpp
|
||||
- Fix a few jpackage related .spec typos, oops.
|
||||
|
||||
* Wed Feb 18 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:1.4-0.rc1.1jpp
|
||||
- Added Patch #0 (velocity-1.4-rc1-ServletTest.patch) from CVS which fixes
|
||||
build problems.
|
||||
|
||||
* Sun May 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.1-2jpp
|
||||
- Add Epochs to dependencies.
|
||||
- Add explicit defattrs.
|
||||
- Add non-versioned javadoc symlinks.
|
||||
- Use sed instead of bash 2 extension when symlinking jars during build.
|
||||
- Use full URL in Source.
|
||||
- Fix -javadoc Group tag.
|
||||
- Drop patch in favour of ant options.
|
||||
- BuildRequire jpackage-utils and antlr (latter needed for Anakia tests).
|
||||
|
||||
* Sat May 24 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3.1-1jpp
|
||||
- 1.3.1 stable release
|
||||
|
||||
* Fri May 23 2003 Richard Bullington-McGuire <rbulling@pkrinternet.com> 1.3-1jpp
|
||||
- 1.3 stable release
|
||||
- Updated for JPackage 1.5
|
||||
- Run JUnit regression tests as part of the build process
|
||||
- Added patch file to fix test case classpath for JUnit standard locations
|
||||
|
||||
* Mon May 06 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.3-0.rc1.1jpp
|
||||
- 1.3.0rc1
|
||||
- dropped patch
|
||||
- versioned dir for javadoc
|
||||
- no dependencies for manual and javadoc packages
|
||||
- stricter dependency for demo package
|
||||
|
||||
* Wed Dec 12 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-1jpp
|
||||
- 1.2
|
||||
- regenerated patch and corrected manifest
|
||||
- requires and buildrequires jdom >= 1.0-0.b7.1
|
||||
|
||||
* Wed Dec 5 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-4jpp
|
||||
- javadoc into javadoc package
|
||||
|
||||
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.1-3jpp
|
||||
- removed packager tag
|
||||
- new jpp extension
|
||||
|
||||
* Thu Nov 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-2jpp
|
||||
- first unified release
|
||||
- s/jPackage/JPackage
|
||||
|
||||
* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.1-1jpp
|
||||
- first Mandrake release
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue