Hello community, here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2012-11-02 22:53:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old) and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes 2011-09-26 10:23:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes 2012-11-02 22:53:44.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Oct 25 07:44:09 UTC 2012 - [email protected] + +- 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 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- fop-1.0-src.tar.gz xmlgraphics-fop-asf51789.patch xmlgraphics-fop-build.patch New: ---- fop-1.1-src.tar.gz fop-1.1-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-fop.spec ++++++ --- /var/tmp/diff_new_pack.8XAFlO/_old 2012-11-02 22:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.8XAFlO/_new 2012-11-02 22:53:48.000000000 +0100 @@ -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,12 +24,12 @@ %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 @@ -41,43 +40,38 @@ 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 @@ representation), Print, AWT, MIF, and TXT. %package javadoc -License: Apache-2.0 Summary: Javadoc for %{name} Group: Documentation/HTML @@ -104,10 +97,15 @@ %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/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 @@ %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 @@ %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 @@ %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog ++++++ fop-1.0-src.tar.gz -> fop-1.1-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/xmlgraphics-fop/fop-1.0-src.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/fop-1.1-src.tar.gz differ: char 13, line 1 ++++++ xmlgraphics-fop-fontlist.xml ++++++ --- /var/tmp/diff_new_pack.8XAFlO/_old 2012-11-02 22:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.8XAFlO/_new 2012-11-02 22:53:48.000000000 +0100 @@ -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> ++++++ xmlgraphics-fop-fontmetrics.xml ++++++ --- /var/tmp/diff_new_pack.8XAFlO/_old 2012-11-02 22:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.8XAFlO/_new 2012-11-02 22:53:48.000000000 +0100 @@ -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> ++++++ xmlgraphics-fop.script ++++++ --- /var/tmp/diff_new_pack.8XAFlO/_old 2012-11-02 22:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.8XAFlO/_new 2012-11-02 22:53:48.000000000 +0100 @@ -24,7 +24,7 @@ # 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 ++++++ xmlgraphics-fop.xml ++++++ --- /var/tmp/diff_new_pack.8XAFlO/_old 2012-11-02 22:53:48.000000000 +0100 +++ /var/tmp/diff_new_pack.8XAFlO/_new 2012-11-02 22:53:48.000000000 +0100 @@ -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> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
