From 72d85e9cf4b56ab3b0c2350b3cdaa4aff8d4d172af79bdb0fcff4842fc9bbac0 Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <thomas.schraitle@suse.com>
Date: Mon, 2 Sep 2013 08:54:34 +0000
Subject: [PATCH 1/2] Version 1.9.22: Added last important changes from new
 layout, both HTML and FO

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=63
---
 suse-xsl-stylesheets-1.9.21.tar.bz2 |  3 --
 suse-xsl-stylesheets-1.9.22.tar.bz2 |  3 ++
 suse-xsl-stylesheets.changes        |  6 +++
 suse-xsl-stylesheets.spec           | 58 ++++++++++++++++++++++++++---
 4 files changed, 61 insertions(+), 9 deletions(-)
 delete mode 100644 suse-xsl-stylesheets-1.9.21.tar.bz2
 create mode 100644 suse-xsl-stylesheets-1.9.22.tar.bz2

diff --git a/suse-xsl-stylesheets-1.9.21.tar.bz2 b/suse-xsl-stylesheets-1.9.21.tar.bz2
deleted file mode 100644
index dacb846..0000000
--- a/suse-xsl-stylesheets-1.9.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bf3322e62cb49f0a12269e68fc4bd5ef5910ce51fb612c693b95bc4cc66e78f
-size 868630
diff --git a/suse-xsl-stylesheets-1.9.22.tar.bz2 b/suse-xsl-stylesheets-1.9.22.tar.bz2
new file mode 100644
index 0000000..202bcc7
--- /dev/null
+++ b/suse-xsl-stylesheets-1.9.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9646c8a95ea17d8ee8c07316512c7fee121f25ddae04e13f143d7f4a4d7c5714
+size 1252942
diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes
index 12fecf9..3e52349 100644
--- a/suse-xsl-stylesheets.changes
+++ b/suse-xsl-stylesheets.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  2 08:09:33 UTC 2013 - toms@opensuse.org
+
+Version 1.9.22:
+Added last important changes from new layout, both HTML and FO 
+
 -------------------------------------------------------------------
 Wed May 29 09:41:08 UTC 2013 - toms@opensuse.org
 
diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec
index 61d7134..8ad8b31 100644
--- a/suse-xsl-stylesheets.spec
+++ b/suse-xsl-stylesheets.spec
@@ -14,8 +14,10 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
 Name:           suse-xsl-stylesheets
-Version:        1.9.21
+Version:        1.9.22
 Release:        0
 
 ###############################################################
@@ -65,16 +67,60 @@ Requires:       libxslt
 Recommends:     daps
 Recommends:     docbook5
 Recommends:     docbook5-xsl-stylesheets
-Recommends:     google-opensans-fonts
-Recommends:     sil-charis-fonts
-Recommends:     dejavu-fonts
+
+#------
+# Fonts
+#------
+%if 0%{?suse_version} >= 1220
+Requires:       dejavu-fonts
+Requires:       gnu-free-fonts
+Requires:       liberation-fonts
+Recommends:     agfa-fonts
+# Japanese:
+Recommends:     sazanami-fonts
+# Korean:
+Recommends:     un-fonts
+%else
+Requires:       dejavu
+Requires:       freefont
+Requires:       liberation-fonts
+Recommends:     agfa-fonts
+# Japanese:
+Recommends:     sazanami-fonts
+# Korean:
+Recommends:     unfonts
+%endif
+# Chinese -- only available from M17N:fonts in Code 11:
+Recommends:     wqy-microhei-fonts
 
 %if 0%{?sles_version}
 Recommends:     ttf-founder-simplified
-%else
-Recommends:     wqy-microhei-fonts
 %endif
 
+# FONTS USED IN suse_beta STYLESHEETS
+# A rather simplistic solution which roughly means that you need M17N:fonts to
+# build the new stylesheets on older OS's.
+%if 0%{?suse_version} >= 1220
+Requires:       google-opensans-fonts
+Requires:       sil-charis-fonts
+%else
+Recommends:     google-opensans-fonts
+Recommends:     sil-charis-fonts
+%endif
+# Monospace -- dejavu-fonts, already required
+# Western fonts fallback -- gnu-free-fonts, already required
+
+# Chinese simplified -- wqy-microhei-fonts, already recommended
+# Chinese traditional:
+Recommends:     arphic-uming-fonts
+# Japanese:
+Recommends:     ipa-pgothic-fonts
+Recommends:     ipa-pmincho-fonts
+# Korean:
+Recommends:     nanum-fonts
+# Arabic:
+Recommends:     arabic-amiri-fonts
+
 Obsoletes:      susedoc <= 4.3.33
 Provides:       susedoc = 4.3.34
 

From 2e4fbb54ab3fcb8e5a8e247756f287e382cef69c9b291e33e883d973b5260195 Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <thomas.schraitle@suse.com>
Date: Wed, 25 Sep 2013 06:01:09 +0000
Subject: [PATCH 2/2] Patch VERSION.xsl

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=64
---
 suse-xsl-stylesheets-1.9.22.tar.bz2 | 4 ++--
 suse-xsl-stylesheets.spec           | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/suse-xsl-stylesheets-1.9.22.tar.bz2 b/suse-xsl-stylesheets-1.9.22.tar.bz2
index 202bcc7..56ef1b2 100644
--- a/suse-xsl-stylesheets-1.9.22.tar.bz2
+++ b/suse-xsl-stylesheets-1.9.22.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9646c8a95ea17d8ee8c07316512c7fee121f25ddae04e13f143d7f4a4d7c5714
-size 1252942
+oid sha256:c0ce34ac3d52e5f48f21a3f7638628b43bfde081239dfe3c516417c6814548ae
+size 1251826
diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec
index 8ad8b31..c5766be 100644
--- a/suse-xsl-stylesheets.spec
+++ b/suse-xsl-stylesheets.spec
@@ -134,6 +134,9 @@ the DocBook 4 DTD.
 #--------------------------------------------------------------------------
 %prep
 %setup -q -n %{name}
+#
+# Patch the VERSION.xsl file to hold the current version
+sed -i "s%<fm:Version>.*</fm:Version>%<fm:Version>%{version}</fm:Version>%" xslt_suse2/VERSION.xsl
 
 #--------------------------------------------------------------------------
 %build