Version 1.9.21:

- Fixed spec file, applied patch upstream, removed patch file

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=61
This commit is contained in:
Thomas Schraitle 2013-05-29 09:43:09 +00:00 committed by Git OBS Bridge
parent 43c68ed3d4
commit e12ef92d55
5 changed files with 16 additions and 114 deletions

View File

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

View File

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 29 09:41:08 UTC 2013 - toms@opensuse.org
Version 1.9.21:
- Fixed spec file, applied patch upstream, removed patch file
-------------------------------------------------------------------
Wed May 29 08:24:27 UTC 2013 - i@marguerite.su

View File

@ -14,10 +14,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: suse-xsl-stylesheets
Version: 1.9.20
Version: 1.9.21
Release: 0
###############################################################
@ -47,9 +45,6 @@ Url: http://sourceforge.net/p/daps/suse-xslt
Source0: http://downloads.sourceforge.net/project/daps/suse-xsl-stylesheets/%{name}-%{version}.tar.bz2
Source1: susexsl-fetch-source
Source2: %{name}.rpmlintrc
# FIXME: remove next release, it'll be upstreamed.
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fop use a wrong alias as Chinese fonts, so Chinese are now "#".
Patch: susexsl-fop-chinese.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -74,6 +69,12 @@ Recommends: google-opensans-fonts
Recommends: sil-charis-fonts
Recommends: dejavu-fonts
%if 0%{?sles_version}
Recommends: ttf-founder-simplified
%else
Recommends: wqy-microhei-fonts
%endif
Obsoletes: susedoc <= 4.3.33
Provides: susedoc = 4.3.34
@ -87,7 +88,6 @@ the DocBook 4 DTD.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
%patch -p2
#--------------------------------------------------------------------------
%build

View File

@ -1,104 +0,0 @@
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
@@ -21,15 +21,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse_mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse_mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
@@ -26,15 +26,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse.mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
@@ -46,15 +46,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse_mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse_mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
@@ -52,15 +52,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse.mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>