Attachment 584974 Details for Bug 822157 – update to 2.3.19

[patch] update to 2.3.19

0001-update-to-2.3.19.patch (text/plain), 29.65 KB, created by gil cattaneo on 2012-05-16 14:04:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-16 14:04:20 UTC

Size: 29.65 KB

patch

obsolete

>From 8703266ab571d49e6c4e62230097c94a5ffee4ff Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Wed, 16 May 2012 14:03:45 +0200
>Subject: [PATCH] update to 2.3.19
>
>---
> .gitignore                           |    1 +
> freemarker-2.3.19-build.patch        |  130 +++++++++++++++++++++++++++++++
> freemarker-2.3.19-enable-jdom.patch  |  127 ++++++++++++++++++++++++++++++
> freemarker-2.3.19-javacc.patch       |   31 ++++++++
> freemarker-2.3.19-logging.patch      |   13 +++
> freemarker-2.3.19-no-javarebel.patch |   36 +++++++++
> freemarker-2.3.19-no-tomcat5.patch   |  140 ++++++++++++++++++++++++++++++++++
> freemarker-2.3.19.pom                |   29 +++++++
> freemarker.spec                      |   42 +++++++----
> sources                              |    2 +-
> 10 files changed, 536 insertions(+), 15 deletions(-)
> create mode 100644 freemarker-2.3.19-build.patch
> create mode 100644 freemarker-2.3.19-enable-jdom.patch
> create mode 100644 freemarker-2.3.19-javacc.patch
> create mode 100644 freemarker-2.3.19-logging.patch
> create mode 100644 freemarker-2.3.19-no-javarebel.patch
> create mode 100644 freemarker-2.3.19-no-tomcat5.patch
> create mode 100644 freemarker-2.3.19.pom
>
>diff --git a/.gitignore b/.gitignore
>index 5894dca..ad8b3b8 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> freemarker-2.3.13.tar.gz
>+/freemarker-2.3.19.tar.gz
>diff --git a/freemarker-2.3.19-build.patch b/freemarker-2.3.19-build.patch
>new file mode 100644
>index 0000000..9986062
>--- /dev/null
>+++ b/freemarker-2.3.19-build.patch
>@@ -0,0 +1,130 @@
>+--- build.xml	2012-03-01 01:56:24.000000000 +0100
>++++ build.xml-gil	2012-05-16 12:33:02.759366191 +0200
>+@@ -58,6 +58,7 @@
>+     <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
>+     <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
>+     <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
>++    <property name="lib.el" location="lib/el-api.jar"/>
>+     
>+     <property name="lib.jython20" location="lib/jython-2.0.jar"/>
>+     <property name="lib.jython22" location="lib/jython-2.2.1.jar"/>
>+@@ -86,11 +87,14 @@
>+     <path id="compile.classpath">
>+         <path refid="compile.nomultiversion.classpath"/>
>+         <pathelement path="${lib.jsp21}"/>
>++        <pathelement path="${lib.el}"/>
>+     </path>
>+ 
>+     <path id="compile.jsp1.classpath">
>+         <path refid="compile.nomultiversion.classpath"/>
>+         <pathelement path="${lib.jsp12}"/>
>++        <pathelement path="${lib.jsp21}"/>
>++        <pathelement path="${lib.el}"/>
>+     </path>
>+ 
>+     <path id="compile.jsp2.classpath">
>+@@ -119,6 +123,8 @@
>+         <pathelement path="${lib.jdom}"/>
>+         <pathelement path="${lib.servlet}"/>
>+         <pathelement path="${lib.jsp20}"/>
>++        <pathelement path="${lib.jsp21}"/>
>++        <pathelement path="${lib.el}"/>
>+     </path>
>+ 
>+     <path id="compile.classpath.javadoc">
>+@@ -139,6 +145,8 @@
>+         <pathelement path="${src.dir}"/>
>+         <pathelement path="${java.class.path}"/>
>+         <pathelement path="${lib.javarebel-sdk}"/>
>++        <pathelement path="${lib.jsp21}"/>
>++        <pathelement path="${lib.el}"/>
>+     </path>
>+ 
>+     <path id="compile.classpath.examples">
>+@@ -297,6 +305,7 @@
>+ 
>+     <target name="fetchlibs" unless="all.libs.present" description="fetch build dependencies and put them in lib directory">
>+         <mkdir dir="lib"/>
>++
>++        <get src="${libs.location}/slf4j-jdk14.jar" dest="lib/slf4j-jdk14.jar" usetimestamp="true"/> < Needed only for testing SLF4J:>
>+         <get src="${libs.location}/commons-logging.jar" dest="lib/commons-logging.jar" usetimestamp="true"/>
>+         <get src="${libs.location}/2.3/rt122.jar" dest="lib/rt122.jar" usetimestamp="true"/>
>+         <get src="${libs.location}/saxpath.jar" dest="lib/saxpath.jar" usetimestamp="true"/>
>+@@ -326,7 +335,7 @@
>+         <get src="${libs.location}/jsp-api-1.2.jar" dest="lib/jsp-api-1.2.jar" usetimestamp="true"/>
>+         <get src="${libs.location}/jsp-api-2.0.jar" dest="lib/jsp-api-2.0.jar" usetimestamp="true"/>
>+         <get src="${libs.location}/jsp-api-2.1.jar" dest="lib/jsp-api-2.1.jar" usetimestamp="true"/>
>+-        <get src="${libs.location}/xalan.jar" dest="lib/xalan.jar" usetimestamp="true"/>
>++        <get src="${libs.location}/xalan.jar" dest="lib/xalan.jar" usetimestamp="true"/-->
>+     </target>
>+ 
>+     <target name="init">
>+@@ -547,7 +556,7 @@
>+         <mkdir dir="${build.classes.dir}"/>
>+         <javac deprecation="off"
>+                 destdir="${build.classes.dir}" debug="on" optimize="off"
>+-                bootclasspath="lib/rt122.jar" source="1.2" target="1.2"
>++                bootclasspath="lib/rt122.jar" source="6" target="6"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+             <patternset refid="freemarker.compile"/>
>+@@ -561,13 +570,13 @@
>+         <antcall target="compile-commons-logging"/>
>+         <antcall target="compile-jdk14"/>
>+         <antcall target="compile-jdk15"/>
>+-        <antcall target="compile-jsp1"/>
>++        
>+         <antcall target="compile-jsp2"/>
>+         <antcall target="compile-jython20"/>
>+         <antcall target="compile-jython22"/>
>+         <antcall target="compile-jython25"/>
>+         <antcall target="compile-dom4j"/>
>+-        <antcall target="compile-jdom"/>
>++        
>+         <antcall target="compile-xalan"/>
>+         <antcall target="compile-jaxen"/>
>+         <antcall target="compile-rhino"/>
>+@@ -580,7 +589,7 @@
>+ 
>+     <target name="compile-log4j" if="log4j.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -591,7 +600,7 @@
>+ 
>+     <target name="compile-logkit" if="logkit.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -602,7 +611,7 @@
>+ 
>+     <target name="compile-slf4j" if="slf4j.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -613,7 +622,7 @@
>+ 
>+     <target name="compile-commons-logging" if="commons-logging.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>diff --git a/freemarker-2.3.19-enable-jdom.patch b/freemarker-2.3.19-enable-jdom.patch
>new file mode 100644
>index 0000000..e7accbc
>--- /dev/null
>+++ b/freemarker-2.3.19-enable-jdom.patch
>@@ -0,0 +1,127 @@
>+diff -Nru freemarker-2.3.19/build.xml freemarker-2.3.19-gil/build.xml
>+--- freemarker-2.3.19/build.xml	2012-05-16 13:22:41.753528850 +0200
>++++ freemarker-2.3.19-gil/build.xml	2012-05-16 13:33:05.935562933 +0200
>+@@ -575,7 +575,7 @@
>+         <antcall target="compile-jython22"/>
>+         <antcall target="compile-jython25"/>
>+         <antcall target="compile-dom4j"/>
>+-        
>++        <antcall target="compile-jdom"/>
>+         <antcall target="compile-xalan"/>
>+         <antcall target="compile-jaxen"/>
>+         <antcall target="compile-rhino"/>
>+diff -Nru freemarker-2.3.19/src/freemarker/ext/jdom/NodeListModel.java freemarker-2.3.19-gil/src/freemarker/ext/jdom/NodeListModel.java
>+--- freemarker-2.3.19/src/freemarker/ext/jdom/NodeListModel.java	2012-03-01 01:56:25.000000000 +0100
>++++ freemarker-2.3.19-gil/src/freemarker/ext/jdom/NodeListModel.java	2012-05-16 13:29:44.097551911 +0200
>+@@ -734,7 +734,7 @@
>+                 else if ("data".equals(localName))
>+                     attr = new Attribute("data", pi.getData());
>+                 else
>+-                    attr = new Attribute(localName, pi.getValue(localName));
>++                    attr = new Attribute(localName, pi.getPseudoAttributeValue(localName));
>+             } else if (node instanceof DocType) {
>+                 DocType doctype = (DocType)node;
>+                 if ("publicId".equals(localName))
>+@@ -844,17 +844,17 @@
>+     private static final Element getParent(Object node)
>+     {
>+         if (node instanceof Element)
>+-            return((Element)node).getParent();
>++            return((Element)node).getParentElement();
>+         else if (node instanceof Attribute)
>+             return((Attribute)node).getParent();
>+         else if (node instanceof Text)
>+-            return((Text)node).getParent();
>++            return((Text)node).getParentElement();
>+         else if (node instanceof ProcessingInstruction)
>+-            return((ProcessingInstruction)node).getParent();
>++            return((ProcessingInstruction)node).getParentElement();
>+         else if (node instanceof Comment)
>+-            return((Comment)node).getParent();
>++            return((Comment)node).getParentElement();
>+         else if (node instanceof EntityRef)
>+-            return((EntityRef)node).getParent();
>++            return((EntityRef)node).getParentElement();
>+         else
>+             // With 2.1 semantics it  makes more sense to just return a null and let the core 
>+             // throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR)
>+@@ -878,7 +878,7 @@
>+             LinkedList list = new LinkedList();
>+             do {
>+                 list.addFirst(parent);
>+-                parent = parent.getParent();
>++                parent = parent.getParentElement();
>+             }
>+             while (parent != null);
>+             return list;
>+@@ -894,7 +894,7 @@
>+             list.addFirst(node);
>+             do {
>+                 list.addFirst(parent);
>+-                parent = parent.getParent();
>++                parent = parent.getParentElement();
>+             }
>+             while (parent != null);
>+             return list;
>+@@ -950,10 +950,10 @@
>+             if (node instanceof Element)
>+                 doc = ((Element)node).getDocument();
>+             else if (node instanceof Attribute) {
>+-                Element parent = ((Attribute)node).getParent();
>++                Element parent = ((Text)node).getParentElement();
>+                 doc = parent == null ? null : parent.getDocument();
>+             } else if (node instanceof Text) {
>+-                Element parent = ((Text)node).getParent();
>++                Element parent = ((Text)node).getParentElement();
>+                 doc = parent == null ? null : parent.getDocument();
>+             } else if (node instanceof Document)
>+                 doc = (Document)node;
>+diff -Nru freemarker-2.3.19/src/freemarker/ext/xml/JdomNavigator.java freemarker-2.3.19-gil/src/freemarker/ext/xml/JdomNavigator.java
>+--- freemarker-2.3.19/src/freemarker/ext/xml/JdomNavigator.java	2012-03-01 01:56:25.000000000 +0100
>++++ freemarker-2.3.19-gil/src/freemarker/ext/xml/JdomNavigator.java	2012-05-16 13:32:06.328559677 +0200
>+@@ -169,7 +169,7 @@
>+                 result.add(new Attribute("data", pi.getData()));
>+             }
>+             else {
>+-                result.add(new Attribute(localName, pi.getValue(localName)));
>++                result.add(new Attribute(localName, pi.getPseudoAttributeValue(localName)));
>+             }
>+         } else if (node instanceof DocType) {
>+             DocType doctype = (DocType)node;
>+@@ -206,22 +206,22 @@
>+ 
>+     Object getParent(Object node) {
>+         if (node instanceof Element) {
>+-            return((Element)node).getParent();
>++            return((Element)node).getParentElement();
>+         }
>+         if (node instanceof Attribute) {
>+             return((Attribute)node).getParent();
>+         }
>+         if (node instanceof Text) {
>+-            return((Text)node).getParent();
>++            return((Text)node).getParentElement();
>+         }
>+         if (node instanceof ProcessingInstruction) {
>+-            return((ProcessingInstruction)node).getParent();
>++            return((ProcessingInstruction)node).getParentElement();
>+         }
>+         if (node instanceof Comment) {
>+-            return((Comment)node).getParent();
>++            return((Comment)node).getParentElement();
>+         }
>+         if (node instanceof EntityRef) {
>+-            return((EntityRef)node).getParent();
>++            return((EntityRef)node).getParentElement();
>+         }
>+         return null;
>+     }
>+@@ -235,7 +235,7 @@
>+             return parent == null ? null : parent.getDocument();
>+         } 
>+         else if (node instanceof Text) {
>+-            Element parent = ((Text)node).getParent();
>++            Element parent = ((Text)node).getParentElement();
>+             return parent == null ? null : parent.getDocument();
>+         } 
>+         else if (node instanceof Document)
>diff --git a/freemarker-2.3.19-javacc.patch b/freemarker-2.3.19-javacc.patch
>new file mode 100644
>index 0000000..1205962
>--- /dev/null
>+++ b/freemarker-2.3.19-javacc.patch
>@@ -0,0 +1,31 @@
>+--- build.xml	2012-05-16 13:50:05.577618606 +0200
>++++ build.xml-gil	2012-05-16 13:50:10.364618868 +0200
>+@@ -488,13 +488,12 @@
>+         description="Build the JavaCC parser from its grammar file">
>+         <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
>+             uri="http://javacc.dev.java.net/"
>+-            classpath="lib/javacc.jar"
>+         />
>+         
>+         <javacc:generate
>+             target="${src.dir}/freemarker/core/FMParser.jj"
>+             outputdirectory="src/freemarker/core"
>+-            javacchome="lib"
>++            javacchome="/usr/share/java/" jdkversion="1.3"
>+         />
>+         <replace
>+             file="src/freemarker/core/FMParser.java"
>+@@ -511,11 +510,11 @@
>+             token="public class FMParserTokenManager"
>+             value="class FMParserTokenManager"
>+         />
>+-        <replace
>++        
>+         <replace
>+             file="src/freemarker/core/SimpleCharStream.java"
>+             token="public final class SimpleCharStream"
>diff --git a/freemarker-2.3.19-logging.patch b/freemarker-2.3.19-logging.patch
>new file mode 100644
>index 0000000..fca0dbe
>--- /dev/null
>+++ b/freemarker-2.3.19-logging.patch
>@@ -0,0 +1,13 @@
>+--- src/freemarker/log/Logger.java	2012-03-01 01:56:24.000000000 +0100
>++++ src/freemarker/log/Logger.java-gil	2012-05-16 13:16:58.400510103 +0200
>+@@ -301,7 +301,9 @@
>+             	
>+                 try
>+                 {
>+-                    return createFactory(i);
>++                    LoggerFactory f = createFactory(i);
>++                    f.getLogger("just.testing");
>++                    return f;
>+                 }
>+                 catch(ClassNotFoundException e)
>+                 {
>diff --git a/freemarker-2.3.19-no-javarebel.patch b/freemarker-2.3.19-no-javarebel.patch
>new file mode 100644
>index 0000000..14d8c96
>--- /dev/null
>+++ b/freemarker-2.3.19-no-javarebel.patch
>@@ -0,0 +1,36 @@
>+diff -Nru freemarker-2.3.19/build.xml freemarker-2.3.19-gil/build.xml
>+--- freemarker-2.3.19/build.xml	2012-05-16 13:03:44.563466757 +0200
>++++ freemarker-2.3.19-gil/build.xml	2012-05-16 13:01:04.725458030 +0200
>+@@ -164,6 +164,7 @@
>+         <exclude name="freemarker/core/RegexBuiltins.java"/>
>+         <exclude name="freemarker/ext/ant/**"/>
>+         <exclude name="freemarker/ext/beans/EnumModels.java"/>
>++        <exclude name="freemarker/ext/beans/JavaRebelIntegration.java"/>
>+         <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
>+         <exclude name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
>+         <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
>+diff -Nru freemarker-2.3.19/src/freemarker/ext/beans/BeansWrapper.java freemarker-2.3.19-gil/src/freemarker/ext/beans/BeansWrapper.java
>+--- freemarker-2.3.19/src/freemarker/ext/beans/BeansWrapper.java	2012-03-01 01:56:25.000000000 +0100
>++++ freemarker-2.3.19-gil/src/freemarker/ext/beans/BeansWrapper.java	2012-05-16 13:03:24.057465638 +0200
>+@@ -232,7 +232,6 @@
>+      */
>+     public BeansWrapper() {
>+         if(javaRebelAvailable) {
>+-            JavaRebelIntegration.registerWrapper(this);
>+         }
>+     }
>+     
>+@@ -1672,13 +1671,7 @@
>+ 
>+     
>+     private static boolean isJavaRebelAvailable() {
>+-        try {
>+-            JavaRebelIntegration.testAvailability();
>+-            return true;
>+-        }
>+-        catch(NoClassDefFoundError e) {
>+             return false;
>+-        }
>+     }
>+     
>+     /**
>diff --git a/freemarker-2.3.19-no-tomcat5.patch b/freemarker-2.3.19-no-tomcat5.patch
>new file mode 100644
>index 0000000..ccb5bde
>--- /dev/null
>+++ b/freemarker-2.3.19-no-tomcat5.patch
>@@ -0,0 +1,140 @@
>+--- build.xml	2012-05-16 12:49:40.018420644 +0200
>++++ build.xml-gil	2012-05-16 12:56:22.835442638 +0200
>+@@ -55,8 +55,6 @@
>+     <property name="lib.struts" location="lib/struts.jar"/>
>+     <property name="lib.rhino" location="lib/js.jar"/>
>+     <property name="lib.servlet" location="lib/servlet.jar"/>
>+-    <property name="lib.jsp12" location="lib/jsp-api-1.2.jar"/>
>+-    <property name="lib.jsp20" location="lib/jsp-api-2.0.jar"/>
>+     <property name="lib.jsp21" location="lib/jsp-api-2.1.jar"/>
>+     <property name="lib.el" location="lib/el-api.jar"/>
>+     
>+@@ -99,7 +97,7 @@
>+ 
>+     <path id="compile.jsp2.classpath">
>+     <path refid="compile.nomultiversion.classpath"/>
>+-    <pathelement path="${lib.jsp20}"/>
>++    <pathelement path="${lib.jsp21}"/>
>+     </path>
>+     
>+     <path id="compile.jython20.classpath">
>+@@ -260,9 +258,9 @@
>+         <include name="freemarker/ext/jsp/FreeMarkerPageContext1.java"/>
>+     </patternset>
>+ 
>+-    <patternset id="freemarker.compile.jsp2">
>+-        <include name="freemarker/ext/jsp/FreeMarkerPageContext2.java"/>
>+-        <include name="freemarker/ext/jsp/FreeMarkerJspFactory2.java"/>
>++    <patternset id="freemarker.compile.jsp21">
>++        <include name="freemarker/ext/jsp/FreeMarkerPageContext21.java"/>
>++        <include name="freemarker/ext/jsp/FreeMarkerJspFactory21.java"/>
>+     </patternset>
>+ 
>+     
>+@@ -571,7 +569,7 @@
>+         <antcall target="compile-jdk14"/>
>+         <antcall target="compile-jdk15"/>
>+         
>+-        <antcall target="compile-jsp2"/>
>++        <antcall target="compile-jsp21"/>
>+         <antcall target="compile-jython20"/>
>+         <antcall target="compile-jython22"/>
>+         <antcall target="compile-jython25"/>
>+@@ -655,7 +653,7 @@
>+ 
>+     <target name="compile-jython20" if="jython20.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -666,7 +664,7 @@
>+ 
>+     <target name="compile-jython22" if="jython22.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -678,7 +676,7 @@
>+     <target name="compile-jython25" if="jython25.available" depends="init">
>+         
>+         <javac destdir="${build.classes.dir}"
>+-                target="1.2" source="1.2"
>++                target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -689,7 +687,7 @@
>+     
>+     <target name="compile-jsp1" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -698,20 +696,20 @@
>+         </javac>
>+     </target>
>+ 
>+-    <target name="compile-jsp2" depends="init">
>++    <target name="compile-jsp21" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+-            <classpath refid="compile.jsp2.classpath"/>
>+-            <patternset refid="freemarker.compile.jsp2"/>
>++            <classpath refid="compile.jsp21.classpath"/>
>++            <patternset refid="freemarker.compile.jsp21"/>
>+         </javac>
>+     </target>
>+ 
>+     <target name="compile-rhino" if="rhino.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -722,7 +720,7 @@
>+ 
>+     <target name="compile-dom4j" if="dom4j.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -733,7 +731,7 @@
>+ 
>+     <target name="compile-jaxen" if="jaxen.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -744,7 +742,7 @@
>+ 
>+     <target name="compile-jdom" if="jdom.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>+@@ -755,7 +753,7 @@
>+     
>+     <target name="compile-xalan" if="xalan.available" depends="init">
>+         <javac destdir="${build.classes.dir}"
>+-                bootclasspath="lib/rt122.jar" target="1.2" source="1.2"
>++                bootclasspath="lib/rt122.jar" target="6" source="6"
>+                 deprecation="off" debug="on" optimize="off"
>+                 includeantruntime="false">
>+             <src path="${src.dir}"/>
>diff --git a/freemarker-2.3.19.pom b/freemarker-2.3.19.pom
>new file mode 100644
>index 0000000..1f45c09
>--- /dev/null
>+++ b/freemarker-2.3.19.pom
>@@ -0,0 +1,29 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+        <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>
>+          <groupId>org.freemarker</groupId>
>+          <artifactId>freemarker</artifactId>
>+          <version>2.3.19</version>
>+          <packaging>jar</packaging>
>+          <name>FreeMarker</name>
>+          <description>
>+            FreeMarker is a "template engine"; a generic tool to generate text output based on templates.
>+          </description>
>+          <url>http://freemarker.org</url>
>+          <licenses>
>+            <license>
>+              <name>BSD-style license</name>
>+              <url>http://freemarker.org/LICENSE.txt</url>
>+            </license>
>+          </licenses>
>+          <scm>
>+            <url>http://freemarker.svn.sourceforge.net/viewvc/freemarker/</url>
>+            <connection>scm:svn:https://freemarker.svn.sourceforge.net/svnroot/freemarker</connection>
>+          </scm>
>+          <dependencies>
>+            
>+          </dependencies>
>+        </project>
>+     
>\ No newline at end of file
>diff --git a/freemarker.spec b/freemarker.spec
>index 02a517d..58572ed 100644
>--- a/freemarker.spec
>+++ b/freemarker.spec
>@@ -5,29 +5,35 @@
> echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1
> 
> %global fm_compatible_ver 2.3
>-%global fm_ver %{fm_compatible_ver}.13
>+%global fm_ver %{fm_compatible_ver}.19
> 
> Name:           freemarker
> Version:        %{fm_ver}
>-Release:        14%{?dist}
>+Release:        1%{?dist}
> Summary:        A template engine
> 
> Group:          Development/Libraries
> License:        BSD
> URL:            http://freemarker.sourceforge.net/
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
>-Source1:        %{name}-%{version}-pom.xml
>+Source1:        http://freemarker.sourceforge.net/maven2/org/%{name}/%{name}/%{version}/%{name}-%{version}.pom
> 
> # disabled functionality: ext/jdom, ext/jsp/FreeMarkerPageContext1, ext/xml/JdomNavigator
>-Patch0:         %{name}-%{version}~build.patch
>-# 
>-Patch1:         %{name}-%{version}~PyObject.__class__.patch
>+Patch0:         %{name}-%{version}-build.patch
>+#
>+Patch1:         %{name}-2.3.13~PyObject.__class__.patch
> # http://netbeans.org/bugzilla/show_bug.cgi?id=156876
>-Patch2:         %{name}-%{version}~logging.patch
>+Patch2:         %{name}-%{version}-logging.patch
> # illegal character in the javadoc comment
>-Patch3:         %{name}-%{version}~encoding.patch
>+Patch3:         %{name}-2.3.13~encoding.patch
> # do not depend on tomcat5
>-Patch4:         no-tomcat5.patch
>+Patch4:         %{name}-%{version}-no-tomcat5.patch
>+# Disable JavaRebelIntegration
>+Patch5:         %{name}-%{version}-no-javarebel.patch
>+# enable jdom extension
>+Patch6:         %{name}-%{version}-enable-jdom.patch
>+# use system javacc and fix Token.java
>+Patch7:         %{name}-%{version}-javacc.patch
> 
> BuildArch:      noarch
> 
>@@ -46,6 +52,7 @@ BuildRequires: junit >= 3.8.2
> BuildRequires: jython >= 2.2.1
> BuildRequires: log4j >= 1.2
> BuildRequires: rhino >= 1.6
>+BuildRequires: slf4j
> BuildRequires: tomcat6-el-2.1-api
> BuildRequires: tomcat6-lib >= 6.0.16
> BuildRequires: tomcat6-servlet-2.5-api >= 6.0
>@@ -76,11 +83,14 @@ This package contains the API documentation for %{name}.
> 
> find -type f $ -iname '*.jar' -o -iname '*.class' $  -exec rm -f '{}' \;
> 
>-%patch0 -p1 -b .sav
>-%patch1 -p1
>-%patch2 -p1
>+%patch0 -p0
>+#  % p atch1 -p1
>+%patch2 -p0
> %patch3 -p1
>-%patch4 -p1
>+%patch4 -p0
>+%patch5 -p1
>+%patch6 -p1
>+%patch7 -p0
> 
> # %{__rm} -rf src/freemarker/core/ParseException.java
> %{__rm} -rf src/freemarker/core/FMParser.java
>@@ -94,7 +104,7 @@ find -type f $ -iname '*.jar' -o -iname '*.class' $  -exec rm -f '{}' \;
> %{__ln_s} -f %{_javadir}/dom4j.jar         lib/dom4j.jar
> %{__ln_s} -f %{_javadir}/emma_ant.jar      lib/emma_ant.jar
> %{__ln_s} -f %{_javadir}/emma.jar          lib/emma.jar
>-%{__ln_s} -f %{_javadir}/javacc.jar        lib/javacc.jar
>+#%{__ln_s} -f %{_javadir}/javacc.jar        lib/javacc.jar
> %{__ln_s} -f %{_javadir}/jaxen.jar         lib/jaxen.jar
> %{__ln_s} -f %{_javadir}/jdom.jar          lib/jdom.jar
> # js.jsr provided by rhino package
>@@ -111,6 +121,7 @@ find -type f $ -iname '*.jar' -o -iname '*.class' $  -exec rm -f '{}' \;
> %{__ln_s} -f %{_javadir}/jython.jar        lib/jython.jar
> %{__ln_s} -f %{_javadir}/log4j.jar         lib/log4j.jar
> %{__ln_s} -f %{_javadir}/avalon-logkit.jar lib/logkit.jar
>+%{__ln_s} -f %{_javadir}/slf4j/api.jar lib/slf4j-api.jar
> 
> # It doesn't required due to OpenJDK 6 is used
> #%{__ln_s} -f %{_javadir}/rt122.jar         lib/rt122.jar
>@@ -164,6 +175,9 @@ dos2unix -k docs/docs/api/package-list
> %doc LICENSE.txt
> 
> %changelog
>+* Wed May 16 2012 gil cattaneo <puntogil@libero.it> - 2.3.19-1
>+- update to 2.3.19
>+
> * Wed Feb 01 2012 Marek Goldmann <mgoldman@redhat.com> - 2.3.13-14
> - Added Maven POM, RHBZ#786383
> 
>diff --git a/sources b/sources
>index 9f1e69d..418fff4 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-8201b01e09828bd268522ed66b50a236  freemarker-2.3.13.tar.gz
>+9d5e28d1f10149f5de26390b22dc009d  freemarker-2.3.19.tar.gz
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 822157: 584974