pool/xmlgraphics-fop
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 83010 from home:yecril71pl:branches:Java:packages

Browse Source 
add OFFO hyphenation pattterns, other minor fixes

OBS-URL: https://build.opensuse.org/request/show/83010
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=14
This commit is contained in:
Michal Vyskocil 2011-09-22 09:20:43 +00:00 committed by Git OBS Bridge
parent 9c5e681caa
commit 0efd9faa42
7 changed files with 231 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fop-1.0-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcf77bf52ca476ff33acc5c1b42e4f3f96553e201fb1a15ea8db4fb4f47cda41
size 15203938

3
fop-1.0-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a7163a1aded5fdfc4a0e46f9c0dbcfed57f0c0affb4500e39ec54fa3c727829
size 16141354

3
offo-hyphenation_v2.0.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79d341820583aa5b77ee00dc7da59bfafb92adceb88c7a1922fe300a90a22c4e
size 858046

43
xmlgraphics-fop-asf51789.patch Normal file
View File

@ -0,0 +1,43 @@
diff -aur o/src/java/org/apache/fop/accessibility/StructureTreeBuilder.java n/src/java/org/apache/fop/accessibility/StructureTreeBuilder.java
--- o/src/java/org/apache/fop/accessibility/StructureTreeBuilder.java 2010-07-12 21:34:46.000000000 +0200
+++ n/src/java/org/apache/fop/accessibility/StructureTreeBuilder.java 2011-09-08 21:55:30.079000000 +0200
@@ -31,7 +31,7 @@
/**
* Helper class that re-builds a structure tree from what is stored in an
- * intermediate XML file (IF XML or Area Tree XML).
+ * intermediate XML file (IF XML or Area Tree XML).
*/
public final class StructureTreeBuilder {
diff -aur o/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java n/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java
--- o/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java 2010-07-12 21:34:39.000000000 +0200
+++ n/src/java/org/apache/fop/afp/fonts/CharacterSetOrientation.java 2011-09-08 22:00:40.773000019 +0200
@@ -107,7 +107,7 @@
* a character rotation other than 0, ascender height loses its
* meaning when the character is lying on its side or is upside down
* with respect to normal viewing orientation. For the general case,
- * Ascender Height is the character<65>s most positive y-axis value.
+ * Ascender Height is the character’s most positive y-axis value.
* For bounded character boxes, for a given character having an
* ascender, ascender height and baseline offset are equal.
* @return the ascender value in millipoints
diff -aur o/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java n/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java
--- o/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java 2010-07-12 21:34:39.000000000 +0200
+++ n/src/java/org/apache/fop/afp/fonts/FopCharacterSet.java 2011-09-08 22:02:28.757999999 +0200
@@ -55,7 +55,7 @@
* a character rotation other than 0, ascender height loses its
* meaning when the character is lying on its side or is upside down
* with respect to normal viewing orientation. For the general case,
- * Ascender Height is the character<65>s most positive y-axis value.
+ * Ascender Height is the character’s most positive y-axis value.
* For bounded character boxes, for a given character having an
* ascender, ascender height and baseline offset are equal.
* @return the ascender value in millipoints
@@ -135,4 +135,4 @@
return charSet.mapChar(c);
}
-}
\ Brak znaku nowej linii na końcu pliku
+}

310
xmlgraphics-fop-pom-template.pom
View File

@ -1,155 +1,155 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<!-- $Id$ --> <!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd"> http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId> <artifactId>fop</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Apache FOP</name> <name>Apache FOP</name>
<version>@version@</version> <version>@version@</version>
<url>http://xmlgraphics.apache.org/fop/</url> <url>http://xmlgraphics.apache.org/fop/</url>
<description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description> <description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description>
<inceptionYear>1999</inceptionYear> <inceptionYear>1999</inceptionYear>
<mailingLists> <mailingLists>
<mailingList> <mailingList>
<name>FOP Users List</name> <name>FOP Users List</name>
<subscribe>fop-users-subscribe@xmlgraphics.apache.org</subscribe> <subscribe>fop-users-subscribe@xmlgraphics.apache.org</subscribe>
<unsubscribe>fop-users-unsubscribe@xmlgraphics.apache.org</unsubscribe> <unsubscribe>fop-users-unsubscribe@xmlgraphics.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive> <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>FOP Developer List</name> <name>FOP Developer List</name>
<subscribe>fop-dev-subscribe@xmlgraphics.apache.org</subscribe> <subscribe>fop-dev-subscribe@xmlgraphics.apache.org</subscribe>
<unsubscribe>fop-dev-unsubscribe@xmlgraphics.apache.org</unsubscribe> <unsubscribe>fop-dev-unsubscribe@xmlgraphics.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive> <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>FOP Commit List</name> <name>FOP Commit List</name>
<subscribe>fop-commits-subscribe@xmlgraphics.apache.org</subscribe> <subscribe>fop-commits-subscribe@xmlgraphics.apache.org</subscribe>
<unsubscribe>fop-commits-unsubscribe@xmlgraphics.apache.org</unsubscribe> <unsubscribe>fop-commits-unsubscribe@xmlgraphics.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive> <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive>
</mailingList> </mailingList>
</mailingLists> </mailingLists>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>
</licenses> </licenses>
<scm> <scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection> <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url> <url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
</scm> </scm>
<organization> <organization>
<name>Apache Software Foundation</name> <name>Apache Software Foundation</name>
<url>http://www.apache.org/</url> <url>http://www.apache.org/</url>
</organization> </organization>
<parent> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
<artifactId>apache</artifactId> <artifactId>apache</artifactId>
<version>7</version> <version>7</version>
</parent> </parent>
<dependencies> <dependencies>
<!-- XML Graphics --> <!-- XML Graphics -->
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId> <artifactId>xmlgraphics-commons</artifactId>
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId> <artifactId>batik-svg-dom</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId> <artifactId>batik-bridge</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId> <artifactId>batik-awt-util</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId> <artifactId>batik-gvt</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId> <artifactId>batik-transcoder</artifactId>
<version>1.7</version> <version>1.7</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId> <artifactId>fop</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-extension</artifactId> <artifactId>batik-extension</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.xmlgraphics</groupId> <groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId> <artifactId>batik-ext</artifactId>
<version>1.7</version> <version>1.7</version>
</dependency> </dependency>
<!-- other dependencies --> <!-- other dependencies -->
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>1.0.4</version> <version>1.0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.1</version> <version>1.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.avalon.framework</groupId> <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId> <artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version> <version>4.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.avalon.framework</groupId> <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId> <artifactId>avalon-framework-impl</artifactId>
<version>4.3.1</version> <version>4.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.2</version> <version>2.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<version>2.7.0</version> <version>2.7.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

9
xmlgraphics-fop.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 9 16:20:40 UTC 2011 - giecrilj@stegny.2a.pl
- restored gzipped archive to avoid HTTP 404
- disabled tests (they take ages to build and they fail anyway, so do we really need them)?
- added standard hyphenation from OFFO
- told ant to use UTF-8
- fix for asf#51789
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 13 08:25:38 UTC 2011 - toms@suse.de Fri May 13 08:25:38 UTC 2011 - toms@suse.de

27
xmlgraphics-fop.spec
View File

@ -22,24 +22,28 @@
%define section free %define section free
%define bname fop %define bname fop
%bcond_with tests
Name: xmlgraphics-fop Name: xmlgraphics-fop
Version: 1.0 Version: 1.0
Release: 11 Release: 11
Summary: Formatter for Printing XSLT Processed XML Files Summary: Formatter for Printing XSLT Processed XML Files
License: ASLv.. License: ASLv..
Group: Productivity/Publishing/XML Group: Productivity/Publishing/XML
Source0: http://www.apache.org/dist/xmlgraphics/fop/source/fop-%{version}-src.tar.bz2 Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.0-src.tar.gz
#FIX-OPENSUSE: add xmlgraphics-commons to classpath #FIX-OPENSUSE: add xmlgraphics-commons to classpath
Source1: %{name}.script Source1: %{name}.script
Source2: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/xmlgraphics-fop-pom-template.pom
Source3: %{name}-fontmetrics.script Source3: %{name}-fontmetrics.script
Source4: %{name}-fontlist.script Source4: %{name}-fontlist.script
Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip
# Manpage(s) # Manpage(s)
Source10: %{name}.xml Source10: %{name}.xml
Source11: %{name}-fontmetrics.xml Source11: %{name}-fontmetrics.xml
Source12: %{name}-fontlist.xml Source12: %{name}-fontlist.xml
Patch0: xmlgraphics-fop-build.patch Patch0: xmlgraphics-fop-build.patch
Patch1: xmlgraphics-fop-cli.patch Patch1: xmlgraphics-fop-cli.patch
Patch2: xmlgraphics-fop-asf51789.patch
Url: http://xmlgraphics.apache.org/fop/ Url: http://xmlgraphics.apache.org/fop/
Requires(post): jpackage-utils >= 1.7.4 Requires(post): jpackage-utils >= 1.7.4
Requires(postun): jpackage-utils >= 1.7.4 Requires(postun): jpackage-utils >= 1.7.4
@ -53,6 +57,7 @@ Requires: xalan-j2
Requires: xerces-j2 Requires: xerces-j2
Requires: xmlgraphics-commons Requires: xmlgraphics-commons
Requires: xml-commons-jaxp-1.3-apis Requires: xml-commons-jaxp-1.3-apis
BuildRequires: unzip
BuildRequires: jpackage-utils >= 1.7.4 BuildRequires: jpackage-utils >= 1.7.4
BuildRequires: java-devel >= 1.5.0 BuildRequires: java-devel >= 1.5.0
BuildRequires: java-javadoc BuildRequires: java-javadoc
@ -92,14 +97,16 @@ Summary: Javadoc for %{name}
Group: Documentation/HTML Group: Documentation/HTML
%description javadoc %description javadoc
Javadoc for %{name}. API documentation for %{name} automatically extracted from comments in source files.
%prep %prep
%setup -q -n %{bname}-%{version} %setup -q -n %{bname}-%{version} -a5
ln -thyph offo-hyphenation/hyph/*.xml
find -name "*.jar" | xargs -t rm find -name "*.jar" | xargs -t rm
%patch0 -p0 -b .build %patch0 -p0 -b .build
%patch1 -p1 -b .cli %patch1 -p1 -b .cli
%patch2 -p1
pushd lib pushd lib
ln -s $(build-classpath excalibur/avalon-framework-api) ln -s $(build-classpath excalibur/avalon-framework-api)
@ -138,14 +145,18 @@ for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
sed -i "s=@VERSION@=%{version}=" $x sed -i "s=@VERSION@=%{version}=" $x
done done
%build %build
export CLASSPATH= export CLASSPATH= LANG=en_US.UTF-8
export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}` export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`
%{ant} \ %{ant} \
-Dbatik.javadoc=%{_javadocdir}/xmlgraphics-batik \ -Dbatik.javadoc=%{_javadocdir}/xmlgraphics-batik \
package junit maven-artifacts package \
%if %{with tests}
junit \
%endif
maven-artifacts
# false
# Build the manpage(s) and HTML # Build the manpage(s) and HTML
DB=/usr/share/xml/docbook/stylesheet/nwalsh/current DB=/usr/share/xml/docbook/stylesheet/nwalsh/current
for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
@ -155,7 +166,6 @@ for m in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
xsltproc --output ${xml%%.xml}.html $DB/html/docbook.xsl $m xsltproc --output ${xml%%.xml}.html $DB/html/docbook.xsl $m
done done
%install %install
# jars # jars
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p $RPM_BUILD_ROOT%{_javadir}
@ -201,7 +211,6 @@ for m in *.1.gz; do
done done
popd popd
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT