From 8a448818071de18d700a81ade7946cd4692f4e78 Mon Sep 17 00:00:00 2001 From: Victor G. Vasilyev Date: Mar 02 2010 13:19:47 +0000 Subject: https://bugzilla.redhat.com/show_bug.cgi?id=569799 http://netbeans.org/bugzilla/show_bug.cgi?id=156876 --- diff --git a/freemarker-2.3.13-PyObject.__class__.patch b/freemarker-2.3.13-PyObject.__class__.patch deleted file mode 100644 index b306227..0000000 --- a/freemarker-2.3.13-PyObject.__class__.patch +++ /dev/null @@ -1,22 +0,0 @@ -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); - } - } diff --git a/freemarker-2.3.13-build.patch b/freemarker-2.3.13-build.patch deleted file mode 100644 index 858a535..0000000 --- a/freemarker-2.3.13-build.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 @@ - - - -+ - - - -@@ -74,6 +75,7 @@ - - - -+ - - - -@@ -104,7 +106,8 @@ - - - -- -+ -+ - - - -@@ -261,6 +264,7 @@ - - - -+ - - - -@@ -445,11 +450,11 @@ - - - -- -+ - - - -- -+ - - - diff --git a/freemarker-2.3.13~PyObject.__class__.patch b/freemarker-2.3.13~PyObject.__class__.patch new file mode 100644 index 0000000..b306227 --- /dev/null +++ b/freemarker-2.3.13~PyObject.__class__.patch @@ -0,0 +1,22 @@ +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); + } + } diff --git a/freemarker-2.3.13~build.patch b/freemarker-2.3.13~build.patch new file mode 100644 index 0000000..6478237 --- /dev/null +++ b/freemarker-2.3.13~build.patch @@ -0,0 +1,991 @@ +diff -Nur freemarker-2.3.13/build.xml freemarker-2.3.13.new/build.xml +--- freemarker-2.3.13/build.xml 2010-02-28 02:18:16.667624788 +0300 ++++ freemarker-2.3.13.new/build.xml 2010-02-28 02:34:34.031253336 +0300 +@@ -51,6 +51,7 @@ + + + ++ + + + +@@ -74,6 +75,7 @@ + + + ++ + + + +@@ -104,7 +106,8 @@ + + + +- ++ ++ + + + +@@ -261,6 +264,7 @@ + + + ++ + + + +@@ -433,7 +438,7 @@ + + +- ++ + + + +@@ -445,11 +450,11 @@ + + + +- ++ + + + +- ++ + + + +@@ -461,7 +466,7 @@ + + + +- ++ + + + +@@ -469,7 +474,7 @@ + + + +- ++ + + + +@@ -493,7 +498,7 @@ + + + +- ++ + + + +@@ -501,7 +506,7 @@ + + + +- ++ + + + +@@ -509,7 +514,7 @@ + + + +- ++ + + + +@@ -517,7 +522,7 @@ + + + +- ++ + + + +@@ -525,7 +530,7 @@ + + + +- ++ + + + +@@ -533,7 +538,7 @@ + + + +- ++ + + + +@@ -541,7 +546,7 @@ + + + +- ++ + + + +@@ -553,7 +558,7 @@ + destdir="${build.classes.dir}" + debug="on" + optimize="off" +- target="1.2" source="1.2"> ++ target="6" source="6"> + + + +diff -Nur freemarker-2.3.13/build.xml~ freemarker-2.3.13.new/build.xml~ +--- freemarker-2.3.13/build.xml~ 1970-01-01 03:00:00.000000000 +0300 ++++ freemarker-2.3.13.new/build.xml~ 2010-02-28 02:26:40.360982530 +0300 +@@ -0,0 +1,829 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/freemarker-2.3.13~encoding.patch b/freemarker-2.3.13~encoding.patch new file mode 100644 index 0000000..dc931b5 --- /dev/null +++ b/freemarker-2.3.13~encoding.patch @@ -0,0 +1,12 @@ +diff -Nur freemarker-2.3.13/src/freemarker/template/LocalizedString.java freemarker-2.3.13.new/src/freemarker/template/LocalizedString.java +--- freemarker-2.3.13/src/freemarker/template/LocalizedString.java 2008-05-05 22:56:37.000000000 +0400 ++++ freemarker-2.3.13.new/src/freemarker/template/LocalizedString.java 2010-02-28 02:57:32.391514174 +0300 +@@ -13,7 +13,7 @@ + * if "fr".equals(lang) + * return "oui"; + * else if "de".equals(lang) +- * return "s�"; ++ * return "s\u00ED"; + * else + * return "yes"; + * } diff --git a/freemarker-2.3.13~logging.patch b/freemarker-2.3.13~logging.patch new file mode 100644 index 0000000..5a76c8d --- /dev/null +++ b/freemarker-2.3.13~logging.patch @@ -0,0 +1,23 @@ +diff -Nur freemarker-2.3.13/src/freemarker/log/Logger.java freemarker-2.3.13.new/src/freemarker/log/Logger.java +--- freemarker-2.3.13/src/freemarker/log/Logger.java 2008-05-05 22:56:37.000000000 +0400 ++++ freemarker-2.3.13.new/src/freemarker/log/Logger.java 2010-02-27 19:35:26.830715627 +0300 +@@ -269,12 +269,18 @@ + { + try + { +- return createFactory(i); ++ LoggerFactory f = createFactory(i); ++ f.getLogger("just.testing"); ++ return f; + } + catch(ClassNotFoundException e) + { + ;//Intentionally ignored + } ++ catch(NoClassDefFoundError e) ++ { ++ ;//Intentionally ignored ++ } + } + System.err.println("*** WARNING: FreeMarker logging suppressed."); + return new NullLoggerFactory(); diff --git a/freemarker.spec b/freemarker.spec index feb11a7..c4aa5c1 100644 --- a/freemarker.spec +++ b/freemarker.spec @@ -1,3 +1,6 @@ +# Prevent brp-java-repack-jars from being run. +%define __jar_repack %{nil} + %define checkForbiddenJARFiles F=`find -type f -iname '*.jar'`; [ ! -z "$F" ] && \ echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1 @@ -6,8 +9,8 @@ echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1 Name: freemarker Version: %{fm_ver} -Release: 6%{?dist} -Summary: FreeMarker template engine +Release: 8%{?dist} +Summary: A template engine Group: Development/Libraries License: BSD @@ -15,9 +18,13 @@ 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 +Patch0: %{name}-%{version}~build.patch +# +Patch1: %{name}-%{version}~PyObject.__class__.patch +# http://netbeans.org/bugzilla/show_bug.cgi?id=156876 +Patch2: %{name}-%{version}~logging.patch +# illegal character in the javadoc comment +Patch3: %{name}-%{version}~encoding.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -72,6 +79,8 @@ find -type f \( -iname '*.jar' -o -iname '*.class' \) -exec rm -f '{}' \; %patch0 -p1 -b .sav %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # %{__rm} -rf src/freemarker/core/ParseException.java %{__rm} -rf src/freemarker/core/FMParser.java @@ -153,6 +162,15 @@ dos2unix -k docs/docs/api/package-list %{_javadocdir}/%{name} %changelog +* Sat Feb 27 2010 Victor G. Vasilyev 2.3.13-8 +- fix build patch for use of the javacc 5.0 +- patch for encoding +- disable brp-java-repack-jars + +* Sat Feb 27 2010 Victor G. Vasilyev 2.3.13-7 +- patch for logging +- remove name from the summary + * Fri Jul 24 2009 Fedora Release Engineering - 2.3.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/import.log b/import.log index fb4b56f..d9719a3 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ freemarker-2_3_13-4_fc10:HEAD:freemarker-2.3.13-4.fc10.src.rpm:1220480615 +freemarker-2_3_13-8_fc13:F-13:freemarker-2.3.13-8.fc13.src.rpm:1267535662