From e14cd08e3ffb74161b080d717a249e9fa210f0f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: May 14 2015 04:26:56 +0000 Subject: Disable javadoc doclint --- diff --git a/0001-Port-to-xmlgraphics-commons-2.0.patch b/0001-Port-to-xmlgraphics-commons-2.0.patch index 7691728..c4818ea 100644 --- a/0001-Port-to-xmlgraphics-commons-2.0.patch +++ b/0001-Port-to-xmlgraphics-commons-2.0.patch @@ -1,7 +1,7 @@ -From a73c52951332b8399dd74e3482d283e0394bf741 Mon Sep 17 00:00:00 2001 +From d346bc582f35a1dce998543d2540c226f3238389 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 16 Mar 2015 16:20:10 +0100 -Subject: [PATCH 1/2] Port to xmlgraphics-commons-2.0 +Subject: [PATCH 1/3] Port to xmlgraphics-commons-2.0 --- src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java | 2 +- diff --git a/0002-Port-to-QDox-2.0.patch b/0002-Port-to-QDox-2.0.patch index a82efd7..8b8ec36 100644 --- a/0002-Port-to-QDox-2.0.patch +++ b/0002-Port-to-QDox-2.0.patch @@ -1,7 +1,7 @@ -From 4b72b9270d7362741548e1aa21a1ee868f0be882 Mon Sep 17 00:00:00 2001 +From 7c14c67785aebe7a3bc7712dc7dde19a790a0034 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 2/2] Port to QDox 2.0 +Subject: [PATCH 2/3] Port to QDox 2.0 --- .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch new file mode 100644 index 0000000..410cc15 --- /dev/null +++ b/0003-Disable-javadoc-doclint.patch @@ -0,0 +1,24 @@ +From 7d404f47740cf679bf2e94a1cc03e78c5692df6c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 14 May 2015 06:26:09 +0200 +Subject: [PATCH 3/3] Disable javadoc doclint + +--- + build.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build.xml b/build.xml +index 7c05049..d15b403 100644 +--- a/build.xml ++++ b/build.xml +@@ -951,6 +951,7 @@ NOTE: + bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." + overview="${src.dir}/java/org/apache/fop/overview.html" + maxmemory="256M"> ++ +
+
+ +-- +2.1.0 + diff --git a/fop.spec b/fop.spec index 3fd8124..f20c5cf 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -17,6 +17,7 @@ Patch0: %{name}-main.patch Patch1: %{name}-Use-sRGB.icc-color-profile-from-icc-profiles-openicc.patch Patch2: 0001-Port-to-xmlgraphics-commons-2.0.patch Patch3: 0002-Port-to-QDox-2.0.patch +Patch4: 0003-Disable-javadoc-doclint.patch BuildArch: noarch @@ -63,6 +64,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -117,6 +119,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Thu May 14 2015 Mikolaj Izdebski - 1.1-10 +- Disable javadoc doclint + * Tue Mar 17 2015 Michael Simacek - 1.1-9 - Port to current QDox and xmlgraphics-commons