Compare commits

...
Sign in to create a new pull request.

112 commits

Author SHA1 Message Date
Jiri Vanek
569a3460ab Bumped to 2.11 2026-01-07 16:27:45 +01:00
Jiri Vanek
b80d40bef5 One more forgotten jdk25 call 2025-07-28 20:25:19 +02:00
Jiri Vanek
9d522f84c9 Reset back to jdk21 2025-07-28 19:56:55 +02:00
Jiri Vanek
cacb104342 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-28 18:58:10 +02:00
Fedora Release Engineering
ab8b78d334 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 20:42:50 +00:00
Fedora Release Engineering
2ece8e4ca2 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 18:39:23 +00:00
Peter Lemenkov
8eb53570f6 Revert "Fop ver. 2.10"
THis version requires org.bouncycastle:bcpkix-jdk15to18:jar:1.78.1
artifact which we don't have.

This reverts commit 82cb284297.
2024-10-22 15:00:25 +03:00
Peter Lemenkov
d8f53f9fee Revert "Fix FTBFS"
This reverts commit c44c4e4a77.
2024-10-22 15:00:25 +03:00
Peter Lemenkov
c44c4e4a77 Fix FTBFS
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2024-10-10 14:48:40 +03:00
Peter Lemenkov
82cb284297 Fop ver. 2.10
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2024-10-09 18:07:29 +03:00
Filipe Rosset
e640d3a33a added build-helper-maven-plugin to fix FTBFS 2024-07-20 02:54:27 -03:00
Fedora Release Engineering
9cf976b797 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 23:28:59 +00:00
Peter Lemenkov
4477872dcc Explicitly mark license files as %license
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2024-07-17 16:07:08 +02:00
Jiri Vanek
03659578a3 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 15:29:20 +01:00
Fedora Release Engineering
2b05493c8e Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 11:54:13 +00:00
Fedora Release Engineering
128bad9de8 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 19:38:57 +00:00
Peter Lemenkov
1895a5a8e9 Missing BR
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2023-10-21 00:52:06 +02:00
Peter Lemenkov
bbb62c54f1 Verify GPG signature
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2023-10-21 00:43:37 +02:00
Peter Lemenkov
752837908c Fop ver. 2.9
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2023-08-22 18:49:29 +02:00
Fedora Release Engineering
f605ef4580 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 20:04:54 +00:00
Tim Orling
182bcfccaa migrated to SPDX license
Signed-off-by: Tim Orling <ticotimo@gmail.com>
2023-02-27 19:17:34 -08:00
Fedora Release Engineering
26ad7171b4 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 03:45:40 +00:00
Peter Lemenkov
5cc39166ad Correct BR version
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2022-12-07 16:14:54 +01:00
Peter Lemenkov
584a07c0c4 Build from cleaned up tarball
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2022-11-16 22:48:02 +01:00
Peter Lemenkov
20c820c74c Fop ver. 2.8
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2022-11-16 22:16:26 +01:00
Fedora Release Engineering
9dc5b4642a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 03:29:26 +00:00
Jiri
afdaf3a425 Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 15:18:42 +02:00
Jiri
881a03ea74 Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-05 20:38:51 +01:00
Peter Lemenkov
1fefb54cb5 Fop ver. 2.7
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2022-01-27 14:14:09 +01:00
Fedora Release Engineering
23886d728b - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 03:17:56 +00:00
Mat Booth
fba0361894 Remove unnecessary BR on servlet 2021-12-06 11:16:14 +00:00
Peter Lemenkov
1120840455 Restore two patches
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2021-08-26 19:48:02 +02:00
Orion Poplawski
27e0713a7f Update to 2.6, build with maven 2021-08-25 09:09:27 -06:00
Fedora Release Engineering
fd19d2765c - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 23:14:34 +00:00
Fedora Release Engineering
952e63d64a - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 05:48:34 +00:00
Peter Lemenkov
2618e005cb Fop ver. 2.5
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2020-11-23 21:35:53 +01:00
Fedora Release Engineering
4b818903f8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 01:02:42 +00:00
Fedora Release Engineering
d80ae02518 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 17:42:50 +00:00
Jiri
4123133409 Rebuilt for JDK-11 2020-07-10 19:25:59 +02:00
Peter Lemenkov
98eaa0c5cb Remove unused file
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2020-02-21 16:12:52 +01:00
Peter Lemenkov
1508f5006c Fop ver. 2.4
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2020-02-21 16:05:23 +01:00
Fedora Release Engineering
7350c234ab - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 18:50:25 +00:00
Fedora Release Engineering
3f3358ead2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 00:53:14 +00:00
Fedora Release Engineering
165dfc634c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 20:00:24 +00:00
Severin Gehwolf
e5bbcb57a9 Add explicit javapackages-tools requirement 2018-08-31 10:21:01 +02:00
Fedora Release Engineering
3cb2a2e7d5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 00:45:19 +00:00
Peter Lemenkov
bdf0f9faf4 Forgot to upload sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2018-05-18 14:54:18 +03:00
Peter Lemenkov
a80773add0 Fop ver. 2.2
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2018-05-18 14:46:58 +03:00
Fedora Release Engineering
78b853efcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 09:59:45 +00:00
Mikolaj Izdebski
6ed788ee34 Elimitate race condition when injecting JAR manifest
Resolves: rhbz#1495235
2017-09-25 18:16:26 +02:00
Mikolaj Izdebski
e1b1b69505 Add fontbox to classpath
Resolves: rhbz#1413340
2017-09-12 08:20:41 +02:00
Fedora Release Engineering
4df9b7b6cd - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 08:38:42 +00:00
Fedora Release Engineering
9161f383d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 09:56:10 +00:00
Michael Simacek
f06e69bdd0 Fix FTBFS 2017-02-01 13:11:20 +01:00
Dennis Gilmore
0c23b90d6e - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 20:41:25 +00:00
Michael Simacek
6b693cacc3 Add fix for FOP-2461 (rhbz#1251173) 2015-08-07 13:05:25 +02:00
Michael Simacek
2dd5bb1263 Update to upstream version 2.0 2015-07-14 17:42:28 +02:00
Dennis Gilmore
389e48b109 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 06:34:34 +00:00
Mikolaj Izdebski
e14cd08e3f Disable javadoc doclint 2015-05-14 06:26:56 +02:00
Michael Simacek
08a56e4ea9 Port to current QDox and xmlgraphics-commons 2015-03-17 14:35:00 +01:00
Michal Srb
8f850881f5 Fix FTBFS 2014-06-16 08:17:25 +02:00
Dennis Gilmore
a7962c4081 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 07:34:08 -05:00
Richard Hughes
0c11a113c9 Drop the icc-profiles-openicc requirement
Switch to using the colord sRGB profile filename.
Resolves: #1042655
2014-01-02 15:41:47 +00:00
Alexander Kurtakov
77fb4f306b Fix the OSGi manifest.
And a few rpmlint warnings.
2013-11-07 13:03:58 +02:00
Michal Srb
a1305e3875 Fix license tag (Resolves: rhbz#979394)
- Add ASL 1.1 license text

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
2013-09-18 14:27:17 +02:00
Dennis Gilmore
60aff48dce - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 06:40:26 -05:00
Michal Srb
5f444749b4 Build from clean tarball
- Spec file clean up

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
2013-06-24 23:11:41 +02:00
Stanislav Ochotnicky
431f8ac04f Merge branch 'f19' 2013-04-18 17:53:47 +02:00
Tom Callaway
c893d8dfa7 update to 1.1, drop non-free color profile and use icc instead 2013-04-15 10:52:06 -04:00
Tom Callaway
12e6e56faf 1.1, use icc free color profile 2013-04-15 10:37:22 -04:00
Dennis Gilmore
359a59e464 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 15:52:55 -06:00
Eric Christensen
f76f5a6407 Fixed changelog 2012-11-18 17:44:01 -05:00
Eric Christensen
4729d9f4f3 Made changes per BZ 825463 2012-11-17 11:52:47 -05:00
Dennis Gilmore
c6b11afb2c - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-18 21:56:14 -05:00
Dennis Gilmore
2caf9180b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-12 20:38:14 -06:00
Ruediger Landmann
290b70a6ca Incorporate workaround from upstream bug #50575 2011-09-07 13:54:51 +10:00
Ruediger Landmann
615639539e Supply missing event-model.xml files 2011-06-21 16:22:37 +10:00
Alexander Kurtakov
363909e77d Remove bundled libraries and patch the build to work with our
versions. Building with bundled libraries was introduced by importing
Mandriva version which uses them.

Reapply Fedora guidelines.
Re-add pom.xml to unbreak Maven stack.
Re-add OSGi manifest to unbreak Eclipse stack.
Remove all bundled jars and classes and fix the build to work with
our libs.
2011-03-10 18:12:08 +02:00
Ruediger Landmann
d8edc4f394 * Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-13
- reinstate updated manifest patch
- change define to global

* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-12
- buildarch: noarch

* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-11
- drop obsolete manifest patch
2011-03-10 15:37:58 +10:00
Ruediger Landmann
220fcec89d * Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-11
- import 1.0 into Fedora, based on Mandriva package
- drop obsolete manifest patch
2011-03-10 11:48:55 +10:00
Dennis Gilmore
7a6e52a091 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 15:13:00 -06:00
Ruediger Landmann
e5e70cbf18 BR qdox 2011-01-04 12:15:51 +10:00
Ruediger Landmann
00c2bd2395 - set BR on xmlgraphics-commons >= 1.4
- Add qdox classpath
2011-01-04 12:01:53 +10:00
Stanislav Ochotnicky
9ad070f68f Add pom file (Resolves rhbz#655804)
- Add LICENSE to javadoc sub-package
- Few other tweaks according to new guidelines
- Make jars and javadoc versionless
2010-12-03 15:32:01 +01:00
Alexander Kurtakov
566757eeac - We need servlet not jsp. 2010-10-01 11:16:46 +03:00
Alexander Kurtakov
cf15cd1a6d - BR jsp. 2010-10-01 10:58:38 +03:00
Alexander Kurtakov
57719457cb - Add more BRs. 2010-10-01 10:46:36 +03:00
Alexander Kurtakov
b7841e3178 - BR ant-nodeps. 2010-10-01 08:17:04 +03:00
Alexander Kurtakov
6d8c4d71cf - Update to 1.0.
- BR/R java 1.6.0 not openjdk (rhbz#620330).
- Remove jars in prep.
2010-10-01 08:03:26 +03:00
Fedora Release Engineering
f6c7b11150 dist-git conversion 2010-07-28 14:42:27 +00:00
Ville Skyttä
a5518d65a6 - Fix specfile encoding. 2010-05-31 19:11:41 +00:00
mef
b837157b0e Add dist to version 2010-03-25 15:32:22 +00:00
mef
65b5289e44 Add maven depmap fragment 2010-03-25 15:25:34 +00:00
Bill Nottingham
d08c529596 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:16:28 +00:00
Jesse Keating
78bf97e387 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-24 23:02:29 +00:00
Jesse Keating
63d6153690 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-24 17:58:33 +00:00
Alexander Kurtakov
c4e9290b94 Add OSGi manifest (needed for eclipse-birt). 2009-02-12 09:36:54 +00:00
Lubomir Rintel
397c31fbbb - New upstream release 2008-12-18 17:03:12 +00:00
Lillian Angel
86dc113ad6 - Updated release. 2008-04-02 20:30:59 +00:00
Lillian Angel
7ee0763d59 - Added CLASSPATH to fop.script. 2008-04-01 13:20:19 +00:00
Lillian Angel
9a80a9201d - Updated sources to 0.95 beta.
- Updated patches.
- Updated release.
- Updated xmlgraphics-common version to 1.3.
2008-03-31 21:23:46 +00:00
Lillian Angel
72da1a3d71 - Updated CLASSPATH.
- Updated release.
2008-03-31 15:13:42 +00:00
Lillian Angel
0f87429fee - Fixed JAVA_HOME to point to openjdk, instead of icedtea. 2008-03-31 14:18:52 +00:00
Lillian Angel
0915f7d170 - Updated build requirements and requirements to include
java-1.6.0-openjdk.
- Updated release.
2008-03-31 14:09:46 +00:00
Lillian Angel
5df0fdd7f5 - Updated build requirements and requirements to include
java-1.6.0-openjdk.
2008-03-31 14:08:24 +00:00
Lillian Angel
ca612fbc5a - Updated Release. 2007-12-07 16:41:53 +00:00
Lillian Angel
1ed4502e3b - Removed ppc/64 conditions since IcedTea is now available for ppc/64. 2007-12-07 03:17:46 +00:00
Lillian Angel
53987927ad - Fixed to build with gcj on ppc/64. 2007-11-27 21:20:49 +00:00
Lillian Angel
6700b3ef72 Reverted last change. 2007-11-27 20:57:09 +00:00
Lillian Angel
4d63a1eabe - Added ExcludeArch to exclude building on ppc and ppc64. IcedTea is not
available on ppc/64 archs.
2007-11-27 20:10:56 +00:00
Lillian Angel
ca6d206ce8 Uploaded new sources 2007-11-27 14:37:11 +00:00
Lillian Angel
3c0a466cea - Fixed rpmlint errors. 2007-11-27 14:33:35 +00:00
14 changed files with 779 additions and 21 deletions

View file

5
.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
/LICENSE-1.1.txt
/event-model.tgz
/fop-[0-9]*.[0-9]*-src.tar.gz
/fop-[0-9]*.[0-9]*-src.tar.gz.asc
/fop-[0-9]*.[0-9]*.pom

22
0001-Main.patch Normal file
View file

@ -0,0 +1,22 @@
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 16:54:43 +0200
Subject: [PATCH] Main
diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java
index a14d20c78..ef11c0839 100644
--- a/fop-core/src/main/java/org/apache/fop/cli/Main.java
+++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java
@@ -215,11 +215,7 @@ public final class Main {
* @param args the command line parameters
*/
public static void main(String[] args) {
- if (checkDependencies()) {
- startFOP(args);
- } else {
- startFOPWithDynamicClasspath(args);
- }
+ startFOP(args);
}
/**

View file

@ -0,0 +1,33 @@
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 16:56:49 +0200
Subject: [PATCH] Use sRGB.icc color profile from colord package
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
index 704898def..1ce14cb4e 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
@@ -22,7 +22,9 @@ package org.apache.fop.pdf;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.io.IOException;
+import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.io.FileInputStream;
import java.util.Set;
import org.apache.commons.io.IOUtils;
@@ -138,7 +140,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace {
public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) {
ICC_Profile profile;
PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream();
- InputStream in = PDFDocument.class.getResourceAsStream("sRGB.icc");
+ InputStream in;
+ try {
+ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc");
+ } catch (FileNotFoundException e) {
+ in = null;
+ }
if (in != null) {
try {
profile = ColorProfileUtil.getICC_Profile(in);

145
0003-Port-to-QDox-2.0.patch Normal file
View file

@ -0,0 +1,145 @@
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 17 Mar 2015 10:59:41 +0100
Subject: [PATCH] Port to QDox 2.0
diff --git a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
index 2351fc870..64cd7edf0 100644
--- a/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
+++ b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
@@ -21,6 +21,7 @@ package org.apache.fop.tools;
import java.io.File;
import java.io.IOException;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -31,14 +32,11 @@ import org.apache.fop.events.model.EventModel;
import org.apache.fop.events.model.EventProducerModel;
import org.apache.fop.events.model.EventSeverity;
-import com.thoughtworks.qdox.JavaDocBuilder;
-import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
+import com.thoughtworks.qdox.JavaProjectBuilder;
import com.thoughtworks.qdox.model.DocletTag;
-import com.thoughtworks.qdox.model.DocletTagFactory;
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaMethod;
import com.thoughtworks.qdox.model.JavaParameter;
-import com.thoughtworks.qdox.model.Type;
/**
* Finds EventProducer interfaces and builds the event model for them.
@@ -61,22 +59,12 @@ class EventProducerCollector {
PRIMITIVE_MAP = Collections.unmodifiableMap(m);
}
- private DocletTagFactory tagFactory;
private List<EventModel> models = new java.util.ArrayList<EventModel>();
/**
* Creates a new EventProducerCollector.
*/
EventProducerCollector() {
- this.tagFactory = createDocletTagFactory();
- }
-
- /**
- * Creates the {@link DocletTagFactory} to be used by the collector.
- * @return the doclet tag factory
- */
- protected DocletTagFactory createDocletTagFactory() {
- return new DefaultDocletTagFactory();
}
/**
@@ -89,9 +77,9 @@ class EventProducerCollector {
*/
public boolean scanFile(File src)
throws IOException, EventConventionException, ClassNotFoundException {
- JavaDocBuilder builder = new JavaDocBuilder(this.tagFactory);
+ JavaProjectBuilder builder = new JavaProjectBuilder();
builder.addSource(src);
- JavaClass[] classes = builder.getClasses();
+ Collection<JavaClass> classes = builder.getClasses();
boolean eventProducerFound = false;
for (JavaClass clazz : classes) {
if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) {
@@ -103,7 +91,7 @@ class EventProducerCollector {
}
private boolean implementsInterface(JavaClass clazz, String intf) {
- JavaClass[] classes = clazz.getImplementedInterfaces();
+ List<JavaClass> classes = clazz.getInterfaces();
for (JavaClass cl : classes) {
if (cl.getFullyQualifiedName().equals(intf)) {
return true;
@@ -121,7 +109,7 @@ class EventProducerCollector {
protected void processEventProducerInterface(JavaClass clazz)
throws EventConventionException, ClassNotFoundException {
EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName());
- JavaMethod[] methods = clazz.getMethods(true);
+ List<JavaMethod> methods = clazz.getMethods(true);
for (JavaMethod method : methods) {
EventMethodModel methodMeta = createMethodModel(method);
prodMeta.addMethod(methodMeta);
@@ -133,20 +121,20 @@ class EventProducerCollector {
private EventMethodModel createMethodModel(JavaMethod method)
throws EventConventionException, ClassNotFoundException {
- JavaClass clazz = method.getParentClass();
+ JavaClass clazz = method.getDeclaringClass();
//Check EventProducer conventions
- if (!method.getReturnType().isVoid()) {
+ if (!method.getReturns().isVoid()) {
throw new EventConventionException("All methods of interface "
+ clazz.getFullyQualifiedName() + " must have return type 'void'!");
}
String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature();
- JavaParameter[] params = method.getParameters();
- if (params.length < 1) {
+ List<JavaParameter> params = method.getParameters();
+ if (params.size() < 1) {
throw new EventConventionException("The method " + methodSig
+ " must have at least one parameter: 'Object source'!");
}
- Type firstType = params[0].getType();
- if (firstType.isPrimitive() || !"source".equals(params[0].getName())) {
+ JavaClass firstType = params.get(0).getJavaClass();
+ if (firstType.isPrimitive() || !"source".equals(params.get(0).getName())) {
throw new EventConventionException("The first parameter of the method " + methodSig
+ " must be: 'Object source'!");
}
@@ -161,12 +149,12 @@ class EventProducerCollector {
}
EventMethodModel methodMeta = new EventMethodModel(
method.getName(), severity);
- if (params.length > 1) {
- for (int j = 1, cj = params.length; j < cj; j++) {
- JavaParameter p = params[j];
+ if (params.size() > 1) {
+ for (int j = 1, cj = params.size(); j < cj; j++) {
+ JavaParameter p = params.get(j);
Class<?> type;
- JavaClass pClass = p.getType().getJavaClass();
- if (p.getType().isPrimitive()) {
+ JavaClass pClass = p.getJavaClass();
+ if (pClass.isPrimitive()) {
type = PRIMITIVE_MAP.get(pClass.getName());
if (type == null) {
throw new UnsupportedOperationException(
@@ -179,10 +167,10 @@ class EventProducerCollector {
methodMeta.addParameter(type, p.getName());
}
}
- Type[] exceptions = method.getExceptions();
- if (exceptions != null && exceptions.length > 0) {
+ List<JavaClass> exceptions = method.getExceptions();
+ if (exceptions != null && exceptions.size() > 0) {
//We only use the first declared exception because that is always thrown
- JavaClass cl = exceptions[0].getJavaClass();
+ JavaClass cl = exceptions.get(0);
methodMeta.setExceptionClass(cl.getFullyQualifiedName());
methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments
}

23
0004-jdk25.patch Normal file
View file

@ -0,0 +1,23 @@
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFOutputIntent.java
@@ -165,7 +165,7 @@
}
bout.write(encode(">>"));
- } catch (IOException ioe) {
+ } catch (Exception ioe) {
log.error("Ignored I/O exception", ioe);
}
byte[] bytes = bout.toByteArray();
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
@@ -263,7 +263,7 @@
indexed.add(new PDFName("DeviceGray"));
try {
baout.write(blues);
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
} else {

Binary file not shown.

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: fop
# $Id$
NAME := fop
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

20
batik-pdf-MANIFEST.MF Normal file
View file

@ -0,0 +1,20 @@
Manifest-Version: 1.0
Main-Class: org.apache.fop.cli.Main
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-SymbolicName: org.apache.batik.pdf
Import-Package: org.apache.batik.bridge,org.apache.batik.dom.svg,org.a
pache.batik.dom.util,org.apache.batik.ext.awt,org.apache.batik.ext.aw
t.g2d,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.apache.b
atik.gvt.text,org.apache.batik.transcoder,org.apache.batik.transcoder
.image,org.apache.batik.transcoder.keys,org.apache.batik.util,org.w3c
.dom
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-Localization: plugin
Bundle-Version: 1.6.0.v200806031500
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.apache.fop.apps,org.apache.fop.fo,org.apache.fop.f
onts,org.apache.fop.fonts.apps,org.apache.fop.fonts.base14,org.apache
.fop.fonts.truetype,org.apache.fop.fonts.type1,org.apache.fop.image,o
rg.apache.fop.image.analyser,org.apache.fop.pdf,org.apache.fop.render
.pdf,org.apache.fop.render.ps,org.apache.fop.svg,org.apache.fop.util

329
changelog Normal file
View file

@ -0,0 +1,329 @@
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 27 2023 Tim Orling <ticotimo@gmail.com> - 2.8-4
- migrated to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-2
- Build from cleaned up tarball
* Wed Nov 16 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.8-1
- Update to 2.8
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.7-3
- Rebuilt for Drop i686 JDKs
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.7-2
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 27 2022 Peter Lemenkov <lemenkov@gmail.com> - 2.7-1
- Update to 2.7
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 06 2021 Mat Booth <mat.booth@gmail.com> - 2.6-3
- Remove unnecessary BR on servlet
* Thu Aug 26 2021 Peter Lemenkov <lemenkov@gmail.com> - 2.6-2
- Restore two patches
* Wed Aug 25 2021 Orion Poplawski <orion@nwra.com> - 2.6-1
- Update to 2.6, build with maven
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 23 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.5-1
- Ver. 2.5
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.4-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Fri Feb 21 2020 Peter Lemenkov <lemenkov@gmail.com> - 2.4-1
- Ver. 2.4
- No nonger requires avalon framework
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 2.2-3
- Add explicit javapackages-tools requirement since fop script
uses java-functions. See RHBZ#1600426.
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 17 2018 Peter Lemenkov <lemenkov@gmail.com> - 2.2-1
- Ver. 2.2
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-8
- Elimitate race condition when injecting JAR manifest
- Resolves: rhbz#1495235
* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
- Add fontbox to classpath
- Resolves: rhbz#1413340
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 2.0-4
- Fix FTBFS
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Aug 07 2015 Michael Simacek <msimacek@redhat.com> - 2.0-2
- Add fix for FOP-2461 (rhbz#1251173)
* Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 2.0-1
- Update to upstream version 2.0
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-10
- Disable javadoc doclint
* Tue Mar 17 2015 Michael Simacek <msimacek@redhat.com> - 1.1-9
- Port to current QDox and xmlgraphics-commons
* Mon Jun 16 2014 Michal Srb <msrb@redhat.com> - 1.1-8
- Fix FTBFS
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Jan 2 2014 Richard Hughes <rhughes@redhat.com> 1.1-6
- Drop the icc-profiles-openicc requirement and switch to using the colord sRGB
profile filename.
- Resolves: #1042655
* Thu Nov 7 2013 Krzysztof Daniel <kdaniel@redhat.com> 1.1-5
- Fix the OSGi manifest.
* Wed Sep 18 2013 Michal Srb <msrb@redhat.com> - 1.1-4
- Fix license tag (Resolves: rhbz#979394)
- Add ASL 1.1 license text
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Jun 21 2013 Michal Srb <msrb@redhat.com> - 1.1-2
- Build from clean tarball
- Spec file clean up
* Fri Apr 12 2013 Michal Srb <msrb@redhat.com> - 1.1-1
- Update to upstream version 1.1
- Replace proprietary color profile with free CP from icc-profiles-openicc package
- Resolves: rhbz#848659
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Nov 18 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-20
- Add xml-commons-apis-ext to classpath
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Jun 21 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-16
- Supply missing event-model.xml files
* Fri Jun 3 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-15
- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath
* Thu Mar 10 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0-14
- Reapply Fedora guidelines.
- Re-add pom.xml to unbreak Maven stack.
- Re-add OSGi manifest to unbreak Eclipse stack.
- Remove all bundled jars and classes and fix the build to work with our libs.
* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-13
- reinstate updated manifest patch
- change define to global
* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-12
- buildarch: noarch
* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-11
- drop obsolete manifest patch
* Thu Mar 10 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-10
- import 1.0 into Fedora, based on Mandriva package
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-8
- BR qdox
* Tue Jan 4 2011 Rüdiger Landmann <r.landmann@redhat.com> - 1.0-7
- set BR on xmlgraphics-commons >= 1.4
- Add qdox classpath
* Thu Dec 09 2010 Paulo Ricardo Zanoni <pzanoni@mandriva.com> 1.0-0.0.3mdv2011.0
- Revision: 617684
- Resubmit after moving
* Fri Dec 3 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-6
- Add LICENSE to javadoc sub-package
- Few other tweaks according to new guidelines
- Make jars and javadoc versionless
- Add pom file (Resolves rhbz#655804)
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-5
- We need servlet not jsp.
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-4
- BR jsp.
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-3
- Add more BRs.
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-2
- BR ant-nodeps.
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0-1
- Update to 1.0.
- BR/R java 1.6.0 not openjdk (rhbz#620330).
- Remove jars in prep.
* Sat Sep 04 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0-0.0.2mdv2011.0
- Revision: 576002
- rebuild for new xmlgraphics-commons
* Sun Aug 29 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0-0.0.1mdv2011.0
- Revision: 574030
- update to new version 1.0
- disable patch 1
- disable gcj support
* Thu Apr 29 2010 Tomasz Pawel Gajc <tpg@mandriva.org> 0.95-0.0.3mdv2010.1
- Revision: 540954
- rebuild
* Fri Sep 11 2009 Thierry Vignaud <tv@mandriva.org> 0.95-0.0.2mdv2010.0
- Revision: 437573
- rebuild
* Wed Dec 17 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 0.95-0.0.1mdv2009.1
- Revision: 315376
- update to new version 0.95
- drop patch0, not needed anymore
- spec file clean
- drop useles buildrequires
- use %%java_home
* Sat Dec 29 2007 David Walluck <walluck@mandriva.org> 0.94-0.2.1mdv2008.1
- Revision: 139372
- spec cleanup
- import fop
* Fri Dec 7 2007 Lillian Angel <langel at redhat.com> - 0.94-2
- Updated Release.
* Thu Dec 6 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Removed ppc/64 conditions since IcedTea is now available for ppc/64.
* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed to build with gcj on ppc/64.
* Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed rpmlint errors.
* Tue Sep 18 2007 Joshua Sumali <jsumali at redhat.com> - 0:0.94-1
- Update to fop 0.94
* Thu Mar 30 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-9jpp
- First build for JPP-1.7
- Replace avalon-framework, avalon-logkit with their new excalibur-*
counterparts
- Drop non-free jimi and jai BRs
* Tue Oct 11 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-8jpp
- Patch to Batik >= 1.5.1
* Fri Oct 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-7jpp
- Omit ant -d flag
* Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-6jpp
- Build with ant-1.6.2
* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:0.20.5-5jpp
- Void change
* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:0.20.5-4jpp
- Upgrade to Ant 1.6.X
* Thu Jan 8 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-3jpp
- BuildRequires ant-optional.
- Crosslink with full J2SE javadocs instead of just JAXP/XML-commons.
- Add Main-Class back to manifest.
* Tue Sep 23 2003 Paul Nasrat <pauln at truemesh.com> - 0:0.20.5-2jpp
- Fix script and requires
- Remove class path in manifest
- New javadoc style
* Sat Jul 19 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-1jpp
- Update to 0.20.5.
- Crosslink with xml-commons-apis and batik javadocs.
- BuildRequires jai, jce and jimi.
* Sat Jun 7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-0.rc3a.1jpp
- Update to 0.20.5rc3a.
- Include fop script.
- Non-versioned javadoc symlinks.
* Thu Apr 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.20.5-0.rc2.1jpp
- Update to 0.20.5rc2 and JPackage 1.5.
* Sun Mar 10 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 0.20.3-1jpp
- 0.20.3 final
- fixed missing symlink
* Mon Jan 21 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 0.20.3-0.rc.1jpp
- 0.20.3rc
- first unified release
- javadoc into javadoc package
- no dependencies for manual package
- s/jPackage/JPackage
- adaptation to new xalan-j2 package
- requires and buildrequires avalon-logkit
* Thu Aug 30 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 0.20.1-1mdk
- first release

27
clean-tarball.sh Executable file
View file

@ -0,0 +1,27 @@
#!/bin/bash
if [ $# -ne 1 ]; then
echo "Usage: ./clean-tarball VERSION"
exit 1
fi
VERSION=${1}
NAME="fop"
wget http://archive.apache.org/dist/xmlgraphics/fop/source/${NAME}-${VERSION}-src.tar.gz
tar xvf ${NAME}-${VERSION}-src.tar.gz
(
cd ${NAME}-${VERSION}
find ./ -name "*.jar" -delete
find ./ -name "*.pdf" -delete
# serialized objects
find ./${NAME}-${VERSION}/ -name "*.ser" -delete
# examples, tests, ...
rm -Rf lib/ examples/ test/ hyph/
rm -Rf src/documentation/
mkdir -p lib/build/
)
tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION}
rm -Rf ${NAME}-${VERSION}.tar.gz

35
fop.script Normal file
View file

@ -0,0 +1,35 @@
#!/bin/sh
#
# Fop script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -f /etc/fop.conf ] ; then
. /etc/fop.conf
fi
# Source user prefs
if [ -f $HOME/.foprc ] ; then
. $HOME/.foprc
fi
# Configuration
MAIN_CLASS=org.apache.fop.cli.Main
# Set parameters
set_jvm
set_classpath commons-io batik-all \
xmlgraphics-commons xml-commons-apis-ext \
commons-logging fontbox fop
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

137
fop.spec Normal file
View file

@ -0,0 +1,137 @@
Name: fop
Summary: XSL-driven print formatter
Version: 2.11
Release: %autorelease
# ASL 1.1:
# several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources
# * Viewer_cs.properties
# * Viewer_fi.properties
# * Viewer_ja.properties
# * Viewer_pl.properties
# * Viewer_ru.properties
# * Viewer_tr.properties
# rest is ASL 2.0
License: Apache-2.0 AND Apache-1.1
URL: https://xmlgraphics.apache.org/fop
Source0: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz
Source1: https://www.apache.org/dist/xmlgraphics/%{name}/source/%{name}-%{version}-src.tar.gz.asc
Source2: %{name}.script
Source3: batik-pdf-MANIFEST.MF
Source4: https://www.apache.org/licenses/LICENSE-1.1.txt
Source5: 5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA.gpg
Patch1: 0001-Main.patch
Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch
Patch3: 0003-Port-to-QDox-2.0.patch
Patch4: 0004-jdk25.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Requires: java-25
Requires: xalan-j2 >= 2.7.0
Requires: xml-commons-apis >= 1.3.04
BuildRequires: bouncycastle-pkix
# Explicit requires for javapackages-tools since fop script
# uses /usr/share/java-utils/java-functions
Requires: javapackages-tools
BuildRequires: apache-commons-io
BuildRequires: apache-commons-logging
BuildRequires: batik
BuildRequires: fontbox
BuildRequires: gnupg2
BuildRequires: javapackages-local-openjdk25
BuildRequires: junit
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-clean-plugin
BuildRequires: maven-local-openjdk25
BuildRequires: build-helper-maven-plugin
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: bouncycastle-pkix
# For servlet, not packaged
#BuildRequires: maven-war-plugin
BuildRequires: pdfbox
BuildRequires: qdox
BuildRequires: xml-maven-plugin
BuildRequires: xmlgraphics-commons >= 2.8
BuildRequires: xmlunit
BuildRequires: xmlunit-assertj
BuildRequires: xmlunit-core
%description
FOP is the world's first print formatter driven by XSL formatting
objects. It is a Java application that reads a formatting object tree
and then turns it into a PDF document. The formatting object tree, can
be in the form of an XML document (output by an XSLT engine like XT or
Xalan) or can be passed in memory as a DOM Document or (in the case of
XT) SAX events.
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
Javadoc for %{name}.
%prep
%{gpgverify} --keyring='%{SOURCE5}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
cp %{SOURCE4} LICENSE-1.1
rm -f fop/lib/*.jar fop/lib/build/*.jar
# Not packaged
%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
%pom_change_dep org.bouncycastle:bcpkix-jdk15to18:1.78.1 org.bouncycastle:bcpkix-jdk18on:1.83 fop-core
%pom_change_dep org.bouncycastle:bcprov-jdk15to18:1.78.1 org.bouncycastle:bcprov-jdk18on:1.83 fop-core
%pom_remove_dep javax.media:jai-core fop-core
%pom_remove_dep com.sun.media:jai-codec fop-core
%pom_remove_dep net.sf.offo:fop-hyph fop-core
%pom_remove_dep net.sf.saxon:saxon fop-core
# Update to current xmlunit
%pom_change_dep xmlunit:xmlunit org.xmlunit:xmlunit-core fop-core
%pom_add_dep org.xmlunit:xmlunit-assertj3 fop-core
# Requires maven-war-plugin
%pom_disable_module fop-servlet
# Requires JAI, not packaged
rm fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
%build
# Skip tests for now, make dirs needed by build but created by tests
mkdir -p fop-events/target/test-classes
%mvn_build -f
%install
%mvn_install
# inject OSGi manifest
jar ufm %{buildroot}%{_javadir}/%{name}/%{name}.jar %{SOURCE3}
# script
install -d -m 755 %{buildroot}%{_bindir}
install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/fop
# data
install -d -m 755 %{buildroot}%{_datadir}/%{name}/conf
cp -rp fop/conf/* %{buildroot}%{_datadir}/%{name}/conf
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
%doc README NOTICE
%license LICENSE LICENSE-1.1
%{_datadir}/%{name}
%{_bindir}/fop
%files javadoc
%doc %{_javadocdir}/%{name}
%license LICENSE LICENSE-1.1
%changelog
%autochangelog

View file

@ -0,0 +1,3 @@
SHA512 (LICENSE-1.1.txt) = 15369f9a39937f9973218840c178a39566e902d8b4bff1deb8956891095529f884068d4873532ce7417c937826dd952bac59b8dc84732412eb243516074b8121
SHA512 (fop-2.11-src.tar.gz) = 9eacdee6d81ecf5af02c6266d20f55642febfa10bc9f3754cfb4d1532743899759d6bc7d362e80f3a1d8d370c54485e455d0ca3eac8b6604a05d3326ffefa00c
SHA512 (fop-2.11-src.tar.gz.asc) = b6ec1565abc6386a08e77016b63ec3931f0c67ecb6f7135984c946a20e8bb4030f358270f21fce84614729ec40b48825f478e4cbc2b10972446bee36f5f8474f