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

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

fop-1.0-src.tar.bz2

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

fop-1.0-src.tar.gz

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

offo-hyphenation_v2.0.zip

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

xmlgraphics-fop-asf51789.patch

@@ -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
++}

xmlgraphics-fop.changes

@@ -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
 

xmlgraphics-fop.spec

@@ -22,24 +22,28 @@
 %define section free
 %define bname fop
 
+%bcond_with tests
+
 Name:           xmlgraphics-fop
 Version:        1.0
 Release:        11
 Summary:        Formatter for Printing XSLT Processed XML Files
 License:        ASLv..
 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
 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
 Source4:        %{name}-fontlist.script
+Source5:        http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip       
 # Manpage(s)
 Source10:       %{name}.xml
 Source11:       %{name}-fontmetrics.xml
 Source12:       %{name}-fontlist.xml
 Patch0:         xmlgraphics-fop-build.patch
 Patch1:         xmlgraphics-fop-cli.patch
+Patch2:         xmlgraphics-fop-asf51789.patch
 Url:            http://xmlgraphics.apache.org/fop/
 Requires(post):    jpackage-utils >= 1.7.4
 Requires(postun):  jpackage-utils >= 1.7.4
@@ -53,6 +57,7 @@ Requires:       xalan-j2
 Requires:       xerces-j2
 Requires:       xmlgraphics-commons
 Requires:       xml-commons-jaxp-1.3-apis
+BuildRequires:  unzip
 BuildRequires:  jpackage-utils >= 1.7.4
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  java-javadoc
@@ -92,14 +97,16 @@ Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
 
 %description    javadoc
-Javadoc for %{name}.
+API documentation for %{name} automatically extracted from comments in source files.
 
 
 %prep
-%setup -q -n %{bname}-%{version}
+%setup -q -n %{bname}-%{version} -a5 
+ln -thyph offo-hyphenation/hyph/*.xml
 find -name "*.jar" | xargs -t rm
 %patch0 -p0 -b .build
 %patch1 -p1 -b .cli
+%patch2 -p1
 
 pushd lib
 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
 done
 
-
 %build
-export CLASSPATH=
+export CLASSPATH= LANG=en_US.UTF-8
 export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`
 %{ant} \
   -Dbatik.javadoc=%{_javadocdir}/xmlgraphics-batik \
-  package junit maven-artifacts
+  package \
+%if %{with tests}
+  junit \
+%endif
+  maven-artifacts 
 
+# false
 # Build the manpage(s) and HTML
 DB=/usr/share/xml/docbook/stylesheet/nwalsh/current
 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
 done
 
-
 %install
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
@@ -201,7 +211,6 @@ for m in *.1.gz; do
 done
 popd 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT