Accepting request 139401 from Java:packages
update to 1.1, requested by documentation team OBS-URL: https://build.opensuse.org/request/show/139401 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=12
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
20dd152512
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1a7163a1aded5fdfc4a0e46f9c0dbcfed57f0c0affb4500e39ec54fa3c727829
|
||||
size 16141354
|
||||
3
fop-1.1-src.tar.gz
Normal file
3
fop-1.1-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:58164cb3298d130522ecd445b8082c71c36242ea6464c8f02ab4157e4a332522
|
||||
size 24513986
|
||||
11
fop-1.1-src.tar.gz.asc
Normal file
11
fop-1.1-src.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.12 (Darwin)
|
||||
|
||||
iQEVAwUAUH2CV2ZUur4O09MXAQJttQf7B+1B+INfHTi9SuMTCAUJKTy2PIfhOklI
|
||||
ArXJS6BT+mnJ2Seep7svdMXvTjygyU0AVQsS/OaPiSqBcQVFIHKGprv3X+FtUq/S
|
||||
lXmLyDh8m1P9rc0CzZQsvATMAFGb5GBKsg9343UAuLiDaS+CAbinB0YwTfNNDiSF
|
||||
2gyWF/K63eDNhbOj4Ux5WbcyfBJM3km3WY6AQKXN6a/bd+AnCXLVO3uRmnSiKHH/
|
||||
q2fGBGPzsTOesQws02A2YSq7Vu9h5N4JQdZKHsT32INPYIVz3qfhMg92xu350O0E
|
||||
q0AMnoAvpb49OR4nMx/LwzE7RKFLOryUyLeVqrwxqqcf2GsXcM/s+A==
|
||||
=9Vi8
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,43 +0,0 @@
|
||||
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
|
||||
+}
|
||||
@ -1,20 +0,0 @@
|
||||
Index: build.xml
|
||||
===================================================================
|
||||
--- build.xml.orig 2010-07-12 21:34:37.000000000 +0200
|
||||
+++ build.xml 2010-11-03 15:32:55.535189854 +0100
|
||||
@@ -974,6 +974,7 @@
|
||||
<target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-fotree"/>
|
||||
<target name="junit-full" depends="junit-reduced, junit-layout, junit-area-tree-xml-format, junit-intermediate-format"/>
|
||||
<target name="junit" depends="junit-full" description="Runs all of FOP's JUnit tests" if="junit.present">
|
||||
+<!--
|
||||
<fail><condition><or><isset property="fop.junit.error"/><isset property="fop.junit.failure"/><not><isset property="hyphenation.present"/></not></or></condition>
|
||||
NOTE:
|
||||
**************************************************************************
|
||||
@@ -983,6 +984,7 @@
|
||||
**************************************************************************
|
||||
</fail>
|
||||
<echo>All Junit tests passed!</echo>
|
||||
+-->
|
||||
<echo>Use the "junit-reports" target to generate HTML test reports</echo>
|
||||
</target>
|
||||
<!-- haven't made this dependent on "junit" as that would rerun all tests -->
|
||||
@ -19,7 +19,7 @@
|
||||
<refmeta>
|
||||
<refentrytitle>&product;</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
<refmiscinfo class="version">@VERSION@</refmiscinfo>
|
||||
<refmiscinfo class="version">1.1</refmiscinfo>
|
||||
<!--<refmiscinfo class="source"></refmiscinfo>-->
|
||||
<refmiscinfo class="manual"
|
||||
>http://xmlgraphics.apache.org/fop/1.0/fonts.html#advanced</refmiscinfo>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<refmeta>
|
||||
<refentrytitle>&product;</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
<refmiscinfo class="version">@VERSION@</refmiscinfo>
|
||||
<refmiscinfo class="version">1.1</refmiscinfo>
|
||||
<!--<refmiscinfo class="source"></refmiscinfo>-->
|
||||
<refmiscinfo class="manual"
|
||||
>http://xmlgraphics.apache.org/fop/1.0/fonts.html#advanced</refmiscinfo>
|
||||
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 25 07:44:09 UTC 2012 - mvyskocil@suse.com
|
||||
|
||||
- add commons-logging and commons-io to Requires and fop script
|
||||
- removed uneeded xalan-j2, xmlcommons and xerces from dependencies
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 24 14:04:38 UTC 2012 - mvyskocil@suse.com
|
||||
|
||||
- update to 1.1
|
||||
* many bug fixes and a number of improvements
|
||||
* support for Complex Scripts (e.g., Arabic, Hebrew, Indic, and Southeast
|
||||
* Asian scripts)
|
||||
* http://xmlgraphics.apache.org/fop/1.1/releaseNotes_1.1.html
|
||||
* This release implements a substantial subset of the W3C
|
||||
* XSL-FO 1.1 Recommendation. For a detailed overview of FOP's compliance with
|
||||
* this recommendation, see Compliance.
|
||||
* http://xmlgraphics.apache.org/fop/compliance.html
|
||||
- obsoleted xmlgraphics-fop-asf51789.patch
|
||||
- obsoleted xmlgraphics-fop-build.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 9 16:20:40 UTC 2011 - giecrilj@stegny.2a.pl
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ fi
|
||||
|
||||
# Rest of the configuration
|
||||
MAIN_CLASS=org.apache.fop.cli.Main
|
||||
BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all xml-commons-jaxp-1.3-apis excalibur/avalon-framework-impl excalibur/avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer"
|
||||
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io excalibur/avalon-framework-impl excalibur/avalon-framework-api batik-all"
|
||||
|
||||
# Set parameters
|
||||
set_jvm
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xmlgraphics-fop
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2000-2008, JPackage Project
|
||||
# All rights reserved.
|
||||
#
|
||||
@ -17,7 +17,6 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%define section free
|
||||
%define bname fop
|
||||
@ -25,15 +24,15 @@
|
||||
%bcond_with tests
|
||||
|
||||
Name: xmlgraphics-fop
|
||||
Version: 1.0
|
||||
Release: 11
|
||||
Version: 1.1
|
||||
Release: 0
|
||||
Summary: Formatter for Printing XSLT Processed XML Files
|
||||
License: Apache-2.0
|
||||
Group: Productivity/Publishing/XML
|
||||
Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.0-src.tar.gz
|
||||
Source0: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz
|
||||
#FIX-OPENSUSE: add xmlgraphics-commons to classpath
|
||||
Source1: %{name}.script
|
||||
Source2: http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/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
|
||||
@ -41,43 +40,38 @@ Source5: http://heanet.dl.sourceforge.net/project/offo/offo-hyphenation/2
|
||||
Source10: %{name}.xml
|
||||
Source11: %{name}-fontmetrics.xml
|
||||
Source12: %{name}-fontlist.xml
|
||||
Patch0: xmlgraphics-fop-build.patch
|
||||
Source1000: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz.asc
|
||||
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
|
||||
Requires: jpackage-utils >= 1.7.4
|
||||
Requires: java >= 1.5.0
|
||||
Requires: xmlgraphics-batik
|
||||
Requires: excalibur-avalon-logkit
|
||||
Requires: commons-io >= 2.4
|
||||
Requires: commons-logging
|
||||
Requires: excalibur-avalon-framework-api
|
||||
Requires: excalibur-avalon-framework-impl
|
||||
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
|
||||
Requires: java >= 1.6.0
|
||||
Requires: jpackage-utils >= 1.7.4
|
||||
Requires: xmlgraphics-batik
|
||||
Requires: xmlgraphics-commons >= 1.5
|
||||
BuildRequires: ant >= 1.6.5
|
||||
BuildRequires: ant-trax
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: junit
|
||||
BuildRequires: xmlgraphics-batik
|
||||
BuildRequires: xmlgraphics-batik-javadoc
|
||||
BuildRequires: excalibur-avalon-logkit
|
||||
BuildRequires: ant-trax
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: excalibur-avalon-framework-api
|
||||
BuildRequires: excalibur-avalon-framework-impl
|
||||
BuildRequires: gpg2
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: java-javadoc
|
||||
BuildRequires: jpackage-utils >= 1.7.4
|
||||
BuildRequires: junit
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: qdox >= 1.12
|
||||
BuildRequires: servlet_api
|
||||
BuildRequires: xalan-j2
|
||||
BuildRequires: xerces-j2
|
||||
BuildRequires: xmlgraphics-commons >= 1.2
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xmlgraphics-batik
|
||||
BuildRequires: xmlgraphics-batik-javadoc
|
||||
BuildRequires: xmlgraphics-commons >= 1.5
|
||||
BuildRequires: xmlunit
|
||||
BuildRequires: xml-commons-jaxp-1.3-apis
|
||||
BuildRequires: qdox
|
||||
BuildRequires: docbook-xsl-stylesheets libxslt
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
#!BuildIgnore: saxon
|
||||
@ -92,7 +86,6 @@ formats: PDF (primary output target), PCL, PS, SVG, XML (area tree
|
||||
representation), Print, AWT, MIF, and TXT.
|
||||
|
||||
%package javadoc
|
||||
License: Apache-2.0
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation/HTML
|
||||
|
||||
@ -104,10 +97,15 @@ API documentation for %{name} automatically extracted from comments in source fi
|
||||
%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
|
||||
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
|
||||
# Replace keyword "VERSION" in XML files with the real one:
|
||||
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
|
||||
sed -i "s=@VERSION@=%{version}=" $x
|
||||
done
|
||||
|
||||
%build
|
||||
pushd lib
|
||||
ln -s $(build-classpath excalibur/avalon-framework-api)
|
||||
ln -s $(build-classpath excalibur/avalon-framework-impl)
|
||||
@ -131,21 +129,10 @@ ln -s $(build-classpath xmlgraphics-batik/script)
|
||||
ln -s $(build-classpath xmlgraphics-batik/transcoder)
|
||||
ln -s $(build-classpath xmlgraphics-batik/util)
|
||||
ln -s $(build-classpath xmlgraphics-batik/xml)
|
||||
ln -s $(build-classpath xalan-j2)
|
||||
ln -s $(build-classpath xalan-j2-serializer)
|
||||
ln -s $(build-classpath xerces-j2)
|
||||
ln -s $(build-classpath xmlgraphics-commons)
|
||||
ln -s $(build-classpath xmlunit)
|
||||
ln -s $(build-classpath qdox)
|
||||
popd
|
||||
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
|
||||
# Replace keyword "VERSION" in XML files with the real one:
|
||||
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
|
||||
sed -i "s=@VERSION@=%{version}=" $x
|
||||
done
|
||||
|
||||
%build
|
||||
export CLASSPATH= LANG=en_US.UTF-8
|
||||
export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`
|
||||
%{ant} \
|
||||
@ -168,51 +155,49 @@ done
|
||||
|
||||
%install
|
||||
# jars
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}
|
||||
install -m 644 build/%{bname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
||||
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
%add_to_maven_depmap org.apache.xmlgraphics %{bname} %{version} JPP %{name}
|
||||
|
||||
# pom
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
|
||||
install -pm 644 build/maven/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
|
||||
install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
|
||||
install -pm 644 build/maven/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
|
||||
|
||||
# script
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
|
||||
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-fontmetrics
|
||||
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}-fontlist
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
|
||||
cp -p %{SOURCE3} %{buildroot}%{_bindir}/%{name}-fontmetrics
|
||||
cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-fontlist
|
||||
# compat symlink
|
||||
ln -s %{name} %{buildroot}%{_bindir}/%{bname}
|
||||
ln -s %{name}-fontmetrics %{buildroot}%{_bindir}/%{bname}-fontmetrics
|
||||
ln -s %{name}-fontlist %{buildroot}%{_bindir}/%{bname}-fontlist
|
||||
|
||||
# data
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
cp -pr hyph $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
cp -pr conf $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr hyph %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr conf %{buildroot}%{_datadir}/%{name}
|
||||
|
||||
# javadoc
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
# Manpages
|
||||
mkdir -p $RPM_BUILD_ROOT%_mandir/man1
|
||||
mkdir -p %{buildroot}%_mandir/man1
|
||||
for m in *.1; do
|
||||
gzip $m
|
||||
done
|
||||
cp -vi *.1.gz $RPM_BUILD_ROOT%_mandir/man1
|
||||
cp -vi *.1.gz %{buildroot}%_mandir/man1
|
||||
|
||||
# Remove prefix xmlgraphics to make also the linked manpage version available
|
||||
pushd $RPM_BUILD_ROOT%_mandir/man1
|
||||
pushd %{buildroot}%_mandir/man1
|
||||
for m in *.1.gz; do
|
||||
ln -s $m ${m#*-}
|
||||
done
|
||||
popd
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
@ -231,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%attr(0755,root,root) %{_bindir}/%{bname}-fontmetrics
|
||||
%attr(0755,root,root) %{_bindir}/%{name}-fontlist
|
||||
%attr(0755,root,root) %{_bindir}/%{bname}-fontlist
|
||||
%{_javadir}/%{name}*.jar
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/maven2/*
|
||||
%config %{_mavendepmapfragdir}/*
|
||||
@ -239,7 +224,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<refmeta>
|
||||
<refentrytitle>&product;</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
<refmiscinfo class="version">@VERSION@</refmiscinfo>
|
||||
<refmiscinfo class="version">1.1</refmiscinfo>
|
||||
<!--<refmiscinfo class="source"></refmiscinfo>-->
|
||||
<refmiscinfo class="manual"
|
||||
>http://xmlgraphics.apache.org/fop/1.0/fonts.html#advanced</refmiscinfo>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user