Accepting request 144816 from home:slavb18:branches:Java:packages
- 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 OBS-URL: https://build.opensuse.org/request/show/144816 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=26
This commit is contained in:
parent
d1f9fac5ac
commit
1170201241
@ -11,6 +11,15 @@ fi
|
|||||||
if [ -f /etc/fop.conf ]; then
|
if [ -f /etc/fop.conf ]; then
|
||||||
. /etc/fop.conf
|
. /etc/fop.conf
|
||||||
fi
|
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
|
# Load user configuration
|
||||||
if [ -f "$HOME/.foprc" ]; then
|
if [ -f "$HOME/.foprc" ]; then
|
||||||
@ -29,4 +38,4 @@ set_flags $BASE_FLAGS
|
|||||||
set_options $BASE_OPTIONS $FOP_OPTS
|
set_options $BASE_OPTIONS $FOP_OPTS
|
||||||
|
|
||||||
# Let's start
|
# Let's start
|
||||||
run "$@"
|
run $fop_exec_args "$@"
|
||||||
|
@ -17,6 +17,15 @@ fi
|
|||||||
if [ -f "$HOME/.foprc" ]; then
|
if [ -f "$HOME/.foprc" ]; then
|
||||||
. "$HOME/.foprc"
|
. "$HOME/.foprc"
|
||||||
fi
|
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
|
# Rest of the configuration
|
||||||
MAIN_CLASS_PFM=org.apache.fop.fonts.apps.PFMReader
|
MAIN_CLASS_PFM=org.apache.fop.fonts.apps.PFMReader
|
||||||
@ -41,4 +50,4 @@ set_flags $BASE_FLAGS
|
|||||||
set_options $BASE_OPTIONS $FOP_OPTS
|
set_options $BASE_OPTIONS $FOP_OPTS
|
||||||
|
|
||||||
# Let's start
|
# Let's start
|
||||||
run "$@"
|
run $fop_exec_args "$@"
|
||||||
|
10
xmlgraphics-fop-xconf.patch
Normal file
10
xmlgraphics-fop-xconf.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- 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 -->
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Dec 9 08:29:33 UTC 2012 - slavb18@gmail.com
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 20 12:53:08 UTC 2012 - mvyskocil@suse.com
|
Tue Nov 20 12:53:08 UTC 2012 - mvyskocil@suse.com
|
||||||
|
|
||||||
|
@ -16,6 +16,15 @@ fi
|
|||||||
if [ -f /etc/fop.conf ]; then
|
if [ -f /etc/fop.conf ]; then
|
||||||
. /etc/fop.conf
|
. /etc/fop.conf
|
||||||
fi
|
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
|
# Load user configuration
|
||||||
if [ -f "$HOME/.foprc" ]; then
|
if [ -f "$HOME/.foprc" ]; then
|
||||||
@ -33,4 +42,4 @@ set_flags $BASE_FLAGS
|
|||||||
set_options $BASE_OPTIONS $FOP_OPTS
|
set_options $BASE_OPTIONS $FOP_OPTS
|
||||||
|
|
||||||
# Let's start
|
# Let's start
|
||||||
run "$@"
|
run $fop_exec_args "$@"
|
||||||
|
@ -42,6 +42,7 @@ Source11: %{name}-fontmetrics.xml
|
|||||||
Source12: %{name}-fontlist.xml
|
Source12: %{name}-fontlist.xml
|
||||||
Source1000: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz.asc
|
Source1000: http://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-1.1-src.tar.gz.asc
|
||||||
Patch1: xmlgraphics-fop-cli.patch
|
Patch1: xmlgraphics-fop-cli.patch
|
||||||
|
Patch2: xmlgraphics-fop-xconf.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
|
||||||
@ -99,6 +100,7 @@ API documentation for %{name} automatically extracted from comments in source fi
|
|||||||
ln -thyph offo-hyphenation/hyph/*.xml
|
ln -thyph offo-hyphenation/hyph/*.xml
|
||||||
find -name "*.jar" | xargs -t rm
|
find -name "*.jar" | xargs -t rm
|
||||||
%patch1 -p1 -b .cli
|
%patch1 -p1 -b .cli
|
||||||
|
%patch2 -p1 -b .cli
|
||||||
|
|
||||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
|
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
|
||||||
# Replace keyword "VERSION" in XML files with the real one:
|
# Replace keyword "VERSION" in XML files with the real one:
|
||||||
@ -178,6 +180,7 @@ ln -s %{name}-fontlist %{buildroot}%{_bindir}/%{bname}-fontlist
|
|||||||
mkdir -p %{buildroot}%{_datadir}/%{name}
|
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||||
cp -pr hyph %{buildroot}%{_datadir}/%{name}
|
cp -pr hyph %{buildroot}%{_datadir}/%{name}
|
||||||
cp -pr conf %{buildroot}%{_datadir}/%{name}
|
cp -pr conf %{buildroot}%{_datadir}/%{name}
|
||||||
|
install -D -m 644 conf/fop.xconf %{buildroot}/etc/fop.xconf
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||||
@ -222,6 +225,7 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/maven2/*
|
%{_datadir}/maven2/*
|
||||||
%config %{_mavendepmapfragdir}/*
|
%config %{_mavendepmapfragdir}/*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
%config(noreplace) /etc/fop.xconf
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
|
Loading…
Reference in New Issue
Block a user