From 10d06e55638056c8479b2e5f2cde10b52ba6a130 Mon Sep 17 00:00:00 2001 From: gil Date: Jul 20 2015 18:58:28 +0000 Subject: fix FTBFS --- diff --git a/freemarker-2.3.19-javadoc.patch b/freemarker-2.3.19-javadoc.patch new file mode 100644 index 0000000..7c7ea9c --- /dev/null +++ b/freemarker-2.3.19-javadoc.patch @@ -0,0 +1,20 @@ +--- build.xml 2015-07-02 17:17:36.650176869 +0200 ++++ build.xml.javadoc 2015-07-02 17:26:12.244406259 +0200 +@@ -131,7 +131,7 @@ + + + +- ++ + + + +@@ -467,6 +467,8 @@ + doctitle="FreeMarker ${version}" + packagenames="freemarker.debug, freemarker.template.*, freemarker.core.*, freemarker.ext.*, freemarker.cache.*, freemarker.log.*" + sourcepath="${src.dir}" ++ encoding="utf-8" ++ additionalparam="-Xdoclint:none" + version="true" + windowtitle="FreeMarker ${version} API" + classpathref="compile.classpath.javadoc" diff --git a/freemarker-2.3.19-pom.patch b/freemarker-2.3.19-pom.patch new file mode 100644 index 0000000..691e70a --- /dev/null +++ b/freemarker-2.3.19-pom.patch @@ -0,0 +1,64 @@ +--- build.xml 2015-07-02 17:09:31.214345653 +0200 ++++ build.xml.pom 2015-07-02 17:09:42.019834057 +0200 +@@ -1064,7 +1064,7 @@ + Note: maven-ant-tasks-x.x.x.jar must be added to ${ANT_HOME}/lib for + this to work. Get it here: http://maven.apache.org/download.html + --> +- ++ + + + + ]]> +- +- +- +- +- +- +-You are about uploading +-${dist.dir.versioned}/lib/freemarker.jar +-into the Maven central repostiry sync. directory. +-Be sure that's the final (released) variation there, +-and that the version number is correct. +-Proceed? +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ********************************************** +- CLEAR THE SCREEN, NOW! Your password is on it! +- ********************************************** + + + diff --git a/freemarker.spec b/freemarker.spec index 54f385f..808522c 100644 --- a/freemarker.spec +++ b/freemarker.spec @@ -9,14 +9,11 @@ echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1 Name: freemarker Version: %{fm_ver} -Release: 10%{?dist} +Release: 11%{?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: http://repo1.maven.org/maven2/org/%{name}/%{name}/%{version}/%{name}-%{version}.pom # disabled functionality: ext/jdom, ext/jsp/FreeMarkerPageContext1, ext/xml/JdomNavigator Patch0: %{name}-%{version}-build.patch @@ -34,6 +31,10 @@ Patch5: %{name}-%{version}-no-javarebel.patch Patch6: %{name}-%{version}-enable-jdom.patch # use system javacc and fix Token.java Patch7: %{name}-%{version}-javacc.patch +# generate pom file +Patch8: %{name}-%{version}-pom.patch +# fix javadoc classpath and doclint issues +Patch9: %{name}-%{version}-javadoc.patch BuildArch: noarch @@ -41,27 +42,23 @@ BuildRequires: ant >= 1.6 BuildRequires: apache-commons-logging 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: javapackages-local 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: slf4j -BuildRequires: tomcat-el-2.2-api +BuildRequires: tomcat-el-3.0-api BuildRequires: tomcat-lib >= 6.0.16 -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api >= 6.0 +BuildRequires: tomcat-jsp-2.3-api +BuildRequires: tomcat-servlet-3.1-api >= 6.0 BuildRequires: xalan-j2 >= 2.7.0 -Requires: java-headless -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 @@ -72,9 +69,7 @@ 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: jpackage-utils +Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -82,18 +77,22 @@ 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 '{}' \; +find . -name "*.jar" -delete +find . -name "*.class" -delete +rm -rf docs/docs/api %patch0 -p0 -# % p atch1 -p1 +# %% p atch1 -p1 %patch2 -p0 %patch3 -p1 %patch4 -p0 %patch5 -p1 %patch6 -p1 %patch7 -p0 +%patch8 -p0 +%patch9 -p0 -# %{__rm} -rf src/freemarker/core/ParseException.java +# %%{__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 @@ -106,14 +105,14 @@ 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 %{__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}/jsp-api-1.2.jar lib/jsp-api-1.2.jar %{__ln_s} -f %{_javadir}/tomcat-jsp-api.jar lib/jsp-api-2.0.jar @@ -126,11 +125,11 @@ find -type f \( -iname '*.jar' -o -iname '*.class' \) -exec rm -f '{}' \; %{__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 +#%%{__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 +#%%{__ln_s} -f %%{_javadir}/saxpath.jar lib/saxpath.jar # The package javax.el isn't included in: %{__ln_s} -f %{_javadir}/tomcat-servlet-api.jar lib/servlet.jar @@ -140,42 +139,33 @@ find -type f \( -iname '*.jar' -o -iname '*.class' \) -exec rm -f '{}' \; %{__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} +%mvn_file org.%{name}:%{name} %{name} -%install -# jars -%{__install} -d -m 755 %{buildroot}%{_javadir} -%{__install} -m 644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar - -# javadoc -%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name} -%{__cp} -pr docs/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%build -# pom -%{__install} -d -m 755 %{buildroot}%{_mavenpomdir} -%{__install} -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +%{ant} jar javadoc maven-upload -# depmap -%add_maven_depmap JPP-%{name}.pom %{name}.jar +%install +%mvn_artifact build/pom.xml lib/%{name}.jar +%mvn_install -J build/api %files -f .mfiles -%defattr(-,root,root,-) -%{_mavenpomdir}/* -%{_javadir}/*.jar -%doc LICENSE.txt README.txt +%doc README.txt +%license LICENSE.txt NOTICE.txt -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name} -%doc LICENSE.txt +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt NOTICE.txt %changelog +* Thu Jul 02 2015 gil cattaneo 2.3.19-11 +- fix FTBFS +- adapt to current guideline +- fix some rpmlint problems +- enable javadoc task +- enable maven-upload task for generate pom file + * Wed Jun 17 2015 Fedora Release Engineering - 2.3.19-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -271,7 +261,7 @@ dos2unix -k docs/docs/api/package-list - %%{__install} and %%{__cp} are used everywhere - %%defattr(-,root,root,-) is used everywhere -* Fri Aug 14 2008 Victor G. Vasilyev 2.3.13-2 +* Thu Aug 14 2008 Victor G. Vasilyev 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