rpms/freemarker/devel freemarker-2.3.13-PyObject.__class__.patch, NONE, 1.1 freemarker-2.3.13-build.patch, NONE, 1.1 freemarker.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/freemarker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22712/devel

Modified Files:
	.cvsignore sources 
Added Files:
	freemarker-2.3.13-PyObject.__class__.patch 
	freemarker-2.3.13-build.patch freemarker.spec import.log 
Log Message:
Initial version


freemarker-2.3.13-PyObject.__class__.patch:

--- NEW FILE freemarker-2.3.13-PyObject.__class__.patch ---
diff -Nur freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java freemarker-2.3.13.new/src/freemarker/ext/jython/JythonHashModel.java
--- freemarker-2.3.13/src/freemarker/ext/jython/JythonHashModel.java	2008-05-05 22:56:38.000000000 +0400
+++ freemarker-2.3.13.new/src/freemarker/ext/jython/JythonHashModel.java	2008-07-17 03:19:42.000000000 +0400
@@ -137,7 +137,8 @@
         {
             throw new TemplateModelException(e);
         }
-        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
+//        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object.__class__.__name__);
+        throw new TemplateModelException("'?keys' is not supported as there is no 'keys' nor 'keySet' attribute on an instance of " + object);
     }
 
     /**
@@ -157,6 +158,7 @@
         {
             throw new TemplateModelException(e);
         }
-        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+//        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object.__class__.__name__);
+        throw new TemplateModelException("'?values' is not supported as there is no 'values' attribute on an instance of " + object);
     }
 }

freemarker-2.3.13-build.patch:

--- NEW FILE freemarker-2.3.13-build.patch ---
diff -Nur freemarker-2.3.13/build.xml freemarker-2.3.13.new/build.xml
--- freemarker-2.3.13/build.xml	2008-05-05 22:56:37.000000000 +0400
+++ freemarker-2.3.13.new/build.xml	2008-07-17 18:10:55.000000000 +0400
@@ -51,6 +51,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.jython" location="lib/jython.jar"/>
     <!-- If not overridden, use default -->
@@ -74,6 +75,7 @@
     <path id="compile.classpath">
         <path refid="compile.nojsp.classpath"/>
         <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.el}"/>
     </path>
 
     <path id="compile.jsp1.classpath">
@@ -104,7 +106,8 @@
         <pathelement path="${lib.saxpath}"/>
         <pathelement path="${lib.xalan}"/> <!-- Xalan is not included with Sun JRE 1.5 with the old classname! -->
         <pathelement path="${lib.servlet}"/>
-        <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.jsp21}"/>
+        <pathelement path="${lib.el}"/>
         <pathelement path="${lib.logkit}"/>
         <pathelement path="${lib.log4j}"/>
         <pathelement path="${src.dir}"/>
@@ -261,6 +264,7 @@
 
     <target name="fetchlibs" unless="all.libs.present" description="fetch build dependencies and put them in lib directory">
 	<mkdir dir="lib"/>
+<!--
 	<echo>Fetching libraries from server.</echo>
 	<get src="${libs.location}/README.txt" dest="lib/README.txt" usetimestamp="true"/>
 	<get src="${libs.location}/ant.jar" dest="lib/ant.jar" usetimestamp="true"/>
@@ -283,6 +287,7 @@
 	<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"/>
+!-->
     </target>
 
     <target name="init">
@@ -445,11 +450,11 @@
         <antcall target="compile-logkit"/>
         <antcall target="compile-jdk14"/>
         <antcall target="compile-jdk15"/>
-        <antcall target="compile-jsp1"/>
+<!--        <antcall target="compile-jsp1"/> -->
         <antcall target="compile-jsp2"/>
         <antcall target="compile-jython"/>
         <antcall target="compile-dom4j"/>
-        <antcall target="compile-jdom"/>
+<!--        <antcall target="compile-jdom"/> -->
         <antcall target="compile-xalan"/>
         <antcall target="compile-jaxen"/>
         <antcall target="compile-rhino"/>


--- NEW FILE freemarker.spec ---
%define checkForbiddenJARFiles F=`find -type f -iname '*.jar'`; [ ! -z "$F" ] && \
echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1

%define fm_compatible_ver 2.3
%define fm_ver %{fm_compatible_ver}.13

Name:           freemarker
Version:        %{fm_ver}
Release:        4%{?dist}
Summary:        FreeMarker template engine

Group:          Development/Libraries
License:        BSD
URL:            http://freemarker.sourceforge.net/
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz

# disabled functionality: ext/jdom, ext/jsp/FreeMarkerPageContext1, ext/xml/JdomNavigator
Patch0:         %{name}-%{version}-build.patch

Patch1:         %{name}-%{version}-PyObject.__class__.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires: ant >= 1.6
BuildRequires: ant-nodeps >= 1.6
BuildRequires: avalon-logkit >= 1.2
BuildRequires: dom4j >= 1.6.1
BuildRequires: dos2unix
BuildRequires: emma >= 2.0
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: javacc >= 4.0
BuildRequires: jaxen >= 1.1
BuildRequires: jdom >= 1.0
BuildRequires: jpackage-utils
BuildRequires: junit >= 3.8.2
BuildRequires: jython >= 2.2.1
BuildRequires: log4j >= 1.2
BuildRequires: rhino >= 1.6
BuildRequires: struts >= 1.2.9
BuildRequires: tomcat5-jsp-2.0-api >= 5.5.26
BuildRequires: tomcat5-servlet-2.4-api >= 5.5
BuildRequires: tomcat6-servlet-2.5-api >= 6.0
BuildRequires: tomcat6-lib >= 6.0.16
BuildRequires: xalan-j2 >= 2.7.0

Requires: java >= 1:1.6.0
Requires: jpackage-utils

%description
FreeMarker is a Java tool to generate text output based on templates.
It is designed to be practical as a template engine to generate web
pages and particularly for servlet-based page production that follows
the MVC (Model View Controller) pattern. That is, you can separate the
work of Java programmers and website designers - Java programmers
needn't know how to design nice websites, and website designers needn't
know Java programming.

%package javadoc
Summary:        Javadocs for %{name}
Group:          Documentation
Requires:       %{name} = %{version}-%{release}
Requires:       jpackage-utils

%description javadoc
This package contains the API documentation for %{name}.

%prep
%setup -q -n %{name}-%{version}

find -type f \( -iname '*.jar' -o -iname '*.class' \)  -exec rm -f '{}' \;

%patch0 -p1 -b .sav
%patch1 -p1

# %{__rm} -rf src/freemarker/core/ParseException.java
%{__rm} -rf src/freemarker/core/FMParser.java
%{__rm} -rf src/freemarker/core/FMParserConstants.java
%{__rm} -rf src/freemarker/core/FMParserTokenManager.java
%{__rm} -rf src/freemarker/core/SimpleCharStream.java
%{__rm} -rf src/freemarker/core/Token.java
%{__rm} -rf src/freemarker/core/TokenMgrError.java

%{__ln_s} -f %{_javadir}/ant.jar           lib/ant.jar
%{__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}/jaxen.jar         lib/jaxen.jar
%{__ln_s} -f %{_javadir}/jdom.jar          lib/jdom.jar
# js.jsr provided by rhino package
%{__ln_s} -f %{_javadir}/js.jar            lib/js.jar

# The JavaServer Pages 1.2 technology isn't provided in Fedora 10
#%{__ln_s} -f %{_javadir}/jsp-api-1.2.jar   lib/jsp-api-1.2.jar

%{__ln_s} -f %{_javadir}/tomcat5-jsp-2.0-api.jar  lib/jsp-api-2.0.jar

%{__ln_s} -f %{_javadir}/tomcat6-jsp-2.1-api.jar  lib/jsp-api-2.1.jar

%{__ln_s} -f %{_javadir}/junit.jar         lib/junit.jar
%{__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

# It doesn't required due to OpenJDK 6 is used
#%{__ln_s} -f %{_javadir}/rt122.jar         lib/rt122.jar

# SAXPath has been merged into the Jaxen codebase and is 
# no longer being maintained separately. See jaxen-1.1.jar
#%{__ln_s} -f %{_javadir}/saxpath.jar       lib/saxpath.jar

# The package javax.el isn't included in:
%{__ln_s} -f %{_javadir}/tomcat6-servlet-2.5-api.jar lib/servlet.jar
# so, el-api.jar is additionally used.
%{__ln_s} -f %{_javadir}/tomcat6/el-api.jar lib/el-api.jar

%{__ln_s} -f %{_javadir}/struts.jar        lib/struts.jar
%{__ln_s} -f %{_javadir}/xalan-j2.jar      lib/xalan.jar

dos2unix -k docs/docs/api/stylesheet.css
dos2unix -k docs/docs/api/package-list

%checkForbiddenJARFiles

%build
%{ant}

%install
%{__rm} -rf %{buildroot}

# jars
%{__install} -d -m 755 %{buildroot}%{_javadir}
%{__install} -m 644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# The freemarker 2.2 isn't compatible with 2.3.
%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{fm_compatible_ver}.jar

# javadoc
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
%{__cp} -pr docs/docs/api/* %{buildroot}%{_javadocdir}/%{name}

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc LICENSE.txt README.txt

%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}

%changelog
* Mon Sep 01 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-4
- Redundant dependency upon xerces-j2 is removed (#456276#c6)
- The dos2unix package is added as the build requirements
- The ant-nodeps build-time requirement is added

* Wed Aug 20 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-3
- The downloads.sourceforge.net host is used in the source URL
- %%{__install} and %%{__cp} are used everywhere
- %%defattr(-,root,root,-) is used everywhere

* Fri Aug 14 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-2
- Appropriate values of Group Tags are chosen from the official list
- Versions of java-devel & jpackage-utils are corrected
- Name of dir for javadoc is changed
- Manual is removed due to http://freemarker.org/docs/index.html

* Fri Jun 06 2008 Victor G. Vasilyev <victor.vasilyev at sun.com> 2.3.13-1
- Initial version


--- NEW FILE import.log ---
freemarker-2_3_13-4_fc10:HEAD:freemarker-2.3.13-4.fc10.src.rpm:1220480615


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freemarker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2008 20:25:03 -0000	1.1
+++ .cvsignore	3 Sep 2008 22:24:10 -0000	1.2
@@ -0,0 +1 @@
+freemarker-2.3.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freemarker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2008 20:25:03 -0000	1.1
+++ sources	3 Sep 2008 22:24:10 -0000	1.2
@@ -0,0 +1 @@
+8201b01e09828bd268522ed66b50a236  freemarker-2.3.13.tar.gz