diff --git a/freemarker-2.3.28.tar.gz b/freemarker-2.3.28.tar.gz deleted file mode 100644 index 65ec13a..0000000 Binary files a/freemarker-2.3.28.tar.gz and /dev/null differ diff --git a/freemarker-2.3.29.tar.gz b/freemarker-2.3.29.tar.gz new file mode 100644 index 0000000..6b26820 Binary files /dev/null and b/freemarker-2.3.29.tar.gz differ diff --git a/freemarker.spec b/freemarker.spec index 2dd4586..97f88fb 100644 --- a/freemarker.spec +++ b/freemarker.spec @@ -1,10 +1,10 @@ Name: freemarker -Version: 2.3.28 +Version: 2.3.29 Release: 1 Summary: The Apache FreeMarker Template Engine -License: ASL 2.0 +License: ASL 2.0 and OFL-1.1 and CC-BY-SA-3.0 URL: https://freemarker.apache.org/ -Source0: https://github.com/apache/incubator-freemarker/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/apache/freemarker/archive/v%{version}/%{name}-%{version}.tar.gz Patch1: jsp-api.patch Patch2: jython-compatibility.patch Patch3: fix-javadoc-encoding.patch @@ -15,7 +15,7 @@ BuildArch: noarch BuildRequires: ant apache-parent apache-commons-logging aqute-bnd dom4j >= 1.6.1 hamcrest BuildRequires: ivy-local glassfish-jsp-api glassfish-servlet-api javacc >= 7.0 jaxen >= 1.1 BuildRequires: jcl-over-slf4j jdom >= 1.0 junit jython log4j-over-slf4j rhino >= 1.6 slf4j -BuildRequires: xalan-j2 >= 2.7.0 +BuildRequires: xalan-j2 >= 2.7.0 saxpath %description Apache FreeMarker is a template engine: a Java library to generate text output (HTML web pages, e-mails, configuration files, source code, etc.) based on @@ -43,14 +43,23 @@ find -type f -name "*.class" -delete rm ivysettings.xml sed -i 's/cachepath conf="IDE"/cachepath conf="javadoc"/' build.xml sed -i '/conf name="IDE"/i' ivy.xml -sed -i -e '/saxpath/d' -e '/avalon-logkit/d' ivy.xml +sed -i '/ - 2.3.29-1 +- Upgrade to 2.3.29 + * Mon Aug 24 2020 liyanan - 2.3.28-1 - package init