Hello community, here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2012-12-14 11:26:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-11-21 17:24:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes 2012-12-14 11:26:52.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Dec 9 08:29:33 UTC 2012 - [email protected] + +- patched fop.xconf + * added <auto-detect/> to pdf renderer section, so now possible to use system fonts like font-family="DejaVuSansMono" +- fix the spec file to install a (default) fop.xconf file in /etc +- patched scripts to use /etc/fop.xconf + +------------------------------------------------------------------- New: ---- xmlgraphics-fop-xconf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-fop.spec ++++++ --- /var/tmp/diff_new_pack.wBn2Yw/_old 2012-12-14 11:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.wBn2Yw/_new 2012-12-14 11:26:56.000000000 +0100 @@ -42,6 +42,7 @@ Source12: %{name}-fontlist.xml 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-xconf.patch Url: http://xmlgraphics.apache.org/fop/ Requires(post): jpackage-utils >= 1.7.4 Requires(postun): jpackage-utils >= 1.7.4 @@ -99,6 +100,7 @@ ln -thyph offo-hyphenation/hyph/*.xml find -name "*.jar" | xargs -t rm %patch1 -p1 -b .cli +%patch2 -p1 -b .cli cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: @@ -178,6 +180,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name} cp -pr hyph %{buildroot}%{_datadir}/%{name} cp -pr conf %{buildroot}%{_datadir}/%{name} +install -D -m 644 conf/fop.xconf %{buildroot}/etc/fop.xconf # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -222,6 +225,7 @@ %{_datadir}/maven2/* %config %{_mavendepmapfragdir}/* %{_mandir}/man1/* +%config(noreplace) /etc/fop.xconf %files javadoc %defattr(0644,root,root,0755) ++++++ xmlgraphics-fop-fontlist.script ++++++ --- /var/tmp/diff_new_pack.wBn2Yw/_old 2012-12-14 11:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.wBn2Yw/_new 2012-12-14 11:26:56.000000000 +0100 @@ -11,6 +11,15 @@ if [ -f /etc/fop.conf ]; then . /etc/fop.conf fi +fopxconf=/etc/fop.xconf +fop_exec_args= +if [ -f "$fopxconf" ] ; then + config_found=0 + for i in "$@"; do if [ "$i" = "-c" ]; then config_found=1; break; fi; done + if [ $config_found = 0 ]; then + fop_exec_args="-c $fopxconf $fop_exec_args" + fi +fi # Load user configuration if [ -f "$HOME/.foprc" ]; then @@ -29,4 +38,4 @@ set_options $BASE_OPTIONS $FOP_OPTS # Let's start -run "$@" +run $fop_exec_args "$@" ++++++ xmlgraphics-fop-fontmetrics.script ++++++ --- /var/tmp/diff_new_pack.wBn2Yw/_old 2012-12-14 11:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.wBn2Yw/_new 2012-12-14 11:26:56.000000000 +0100 @@ -17,6 +17,15 @@ if [ -f "$HOME/.foprc" ]; then . "$HOME/.foprc" fi +fopxconf=/etc/fop.xconf +fop_exec_args= +if [ -f "$fopxconf" ] ; then + config_found=0 + for i in "$@"; do if [ "$i" = "-c" ]; then config_found=1; break; fi; done + if [ $config_found = 0 ]; then + fop_exec_args="-c $fopxconf $fop_exec_args" + fi +fi # Rest of the configuration MAIN_CLASS_PFM=org.apache.fop.fonts.apps.PFMReader @@ -41,4 +50,4 @@ set_options $BASE_OPTIONS $FOP_OPTS # Let's start -run "$@" +run $fop_exec_args "$@" ++++++ xmlgraphics-fop-xconf.patch ++++++ --- fop-1.1.orig/conf/fop.xconf 2012-11-11 10:53:23.000000000 +0400 +++ fop-1.1/conf/fop.xconf 2012-12-09 10:57:56.000000000 +0400 @@ -78,6 +78,7 @@ <font-triplet name="ArialMT" style="normal" weight="bold"/> </font> --> + <auto-detect/> </fonts> <!-- This option lets you specify additional options on an XML handler --> ++++++ xmlgraphics-fop.script ++++++ --- /var/tmp/diff_new_pack.wBn2Yw/_old 2012-12-14 11:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.wBn2Yw/_new 2012-12-14 11:26:56.000000000 +0100 @@ -16,6 +16,15 @@ if [ -f /etc/fop.conf ]; then . /etc/fop.conf fi +fopxconf=/etc/fop.xconf +fop_exec_args= +if [ -f "$fopxconf" ] ; then + config_found=0 + for i in "$@"; do if [ "$i" = "-c" ]; then config_found=1; break; fi; done + if [ $config_found = 0 ]; then + fop_exec_args="-c $fopxconf $fop_exec_args" + fi +fi # Load user configuration if [ -f "$HOME/.foprc" ]; then @@ -33,4 +42,4 @@ set_options $BASE_OPTIONS $FOP_OPTS # Let's start -run "$@" +run $fop_exec_args "$@" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
