Accepting request 416410 from home:stfnknorr:branches:Documentation:Tools

Stable release of the SUSE XSL stylesheets 2.0.6:
Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER
* Schema
  - Completely removed schemas from SUSE XSL Stylesheets: Schemas
    can now be found at https://github.com/openSUSE/geekodoc
* SUSE Word List for aspell
  - Added more words, many of which were found in SUSE release
    notes
* Stylesheets (PDF)
  - Allow disabling secondary branding (Geeko Tail) via parameter:
    enable.secondary.branding=0
* Stylesheets (XHTML)
  - Added syntax highlighting for screens
    - To enable, add language="..." to your screen
    - Recognized languages are: bash, c++, css, diff, html, xml,
      http, ini, json, java, javascript, makefile, nginx, php,
      perl, python, ruby, sql, crmsh, dockerfile, lisp, yaml
  - Report Bug Links: Fixed ampersands in Bugzilla URLs
  - Report Bug Links: Fixed JavaScript responsible for GitHub labels
* Common Stylesheet Changes
  - Fixed a number of L10N issues in CJK and European languages
    (suse-xsl #218, suse-xsl #51, suse-xsl #200, suse-xsl #82,
    suse-xsl #87, suse-xsl #79)
  - Reverted back to VERSION.xsl as used by upstream for
    compatibility
  - Improved screen trimming behavior to fix screens that contain
    whitespace at beginning and end
* Packaging
  - Added more fonts to requires to avoid broken foreign-language
    PDF builds in the build service
  - Removed mentions of schemas from spec file (see top)

OBS-URL: https://build.opensuse.org/request/show/416410
OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=102

suse-xsl-stylesheets-2.0.5.tar.bz2

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

suse-xsl-stylesheets-2.0.6.tar.bz2

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

suse-xsl-stylesheets.changes

@@ -1,7 +1,51 @@
+-------------------------------------------------------------------
+Mon Aug  1 15:30:00 UTC 2016 - sknorr@suse.com
+
+Stable release of the SUSE XSL stylesheets 2.0.6:
+
+Find issues in our GitHub tracker at
+https://github.com/openSUSE/suse-xsl/issues/NUMBER
+
+* Schema
+  - Completely removed schemas from SUSE XSL Stylesheets: Schemas
+    can now be found at https://github.com/openSUSE/geekodoc
+
+* SUSE Word List for aspell
+  - Added more words, many of which were found in SUSE release
+    notes
+
+* Stylesheets (PDF)
+  - Allow disabling secondary branding (Geeko Tail) via parameter:
+    enable.secondary.branding=0
+
+* Stylesheets (XHTML)
+  - Added syntax highlighting for screens
+    - To enable, add language="..." to your screen
+    - Recognized languages are: bash, c++, css, diff, html, xml,
+      http, ini, json, java, javascript, makefile, nginx, php,
+      perl, python, ruby, sql, crmsh, dockerfile, lisp, yaml
+  - Report Bug Links: Fixed ampersands in Bugzilla URLs
+  - Report Bug Links: Fixed JavaScript responsible for GitHub labels
+
+* Common Stylesheet Changes
+  - Fixed a number of L10N issues in CJK and European languages
+    (suse-xsl #218, suse-xsl #51, suse-xsl #200, suse-xsl #82,
+    suse-xsl #87, suse-xsl #79)
+  - Reverted back to VERSION.xsl as used by upstream for
+    compatibility
+  - Improved screen trimming behavior to fix screens that contain
+    whitespace at beginning and end
+
+* Packaging
+  - Added more fonts to requires to avoid broken foreign-language
+    PDF builds in the build service
+  - Removed mentions of schemas from spec file (see top)
+
+
 -------------------------------------------------------------------
 Fri Apr 22 11:39:19 UTC 2016 - toms@opensuse.org
 
-Stable release DAPS 2.0.5:
+Stable release of the SUSE XSL stylesheets 2.0.5:
 
 Find issues in our GitHub tracker at
 https://github.com/openSUSE/suse-xsl/issues/NUMBER
@@ -57,7 +101,7 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER
 -------------------------------------------------------------------
 Thu Dec  3 15:45:32 UTC 2015 - toms@opensuse.org
 
-Stable release DAPS 2.0.4:
+Stable release of the SUSE XSL stylesheets 2.0.4:
 
 Find issues in our GitHub tracker at 
 https://github.com/openSUSE/suse-xsl/issues/NUMBER
@@ -99,7 +143,7 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER
 -------------------------------------------------------------------
 Tue Aug 11 15:11:52 UTC 2015 - toms@opensuse.org
 
-Stable release 2.0.3 (only for OBS):
+Stable release of the SUSE XSL stylesheets 2.0.3 (only for OBS):
 
 - Schema:
   . Fixed #41: Missing prompt element
@@ -115,7 +159,7 @@ Stable release 2.0.3 (only for OBS):
 -------------------------------------------------------------------
 Tue Jul  7 09:57:42 UTC 2015 - toms@opensuse.org
 
-Stable release 2.0.2
+Stable release of the SUSE XSL stylesheets 2.0.2
 
 - Fixed font issue for bsc#937209
 - Everything (incl. schemas) that is generated now goes to build/
@@ -123,7 +167,7 @@ Stable release 2.0.2
 -------------------------------------------------------------------
 Thu Jul  2 07:48:22 UTC 2015 - toms@opensuse.org
 
-Stable release 2.0.1
+Stable release of the SUSE XSL stylesheets 2.0.1
 
 - Schema
   . Enabled subtitle and textobject (susedoc5.rnc)
@@ -140,7 +184,7 @@ Stable release 2.0.1
 -------------------------------------------------------------------
 Fri Jun 19 12:47:56 UTC 2015 - fsundermeyer@opensuse.org
 
-Stable release 2.0
+Stable release of the SUSE XSL stylesheets 2.0
 
 - added latest products to .js file to create correct Bugzilla
   links in Draft mode
@@ -148,7 +192,7 @@ Stable release 2.0
 -------------------------------------------------------------------
 Thu Jun 11 13:55:14 UTC 2015 - fsundermeyer@opensuse.org
 
-New release 2.0-rc6:
+New release of the SUSE XSL stylesheets 2.0-rc6:
 
 * added SUSEdoc, a fully DocBook 5 compatible schema with a subset
   of DocBook commands (like NovDoc for DocBook 4)
@@ -164,7 +208,7 @@ Mon Apr 27 12:00:09 UTC 2015 - fsundermeyer@opensuse.org
 -------------------------------------------------------------------
 Fri Apr 24 20:52:45 UTC 2015 - fsundermeyer@opensuse.org
 
-New release 2.0~rc5
+New release of the SUSE XSL stylesheets 2.0~rc5
 
 New Features:
  * support for DocBook5 - the xsl-ns variants are located in the following
@@ -199,7 +243,7 @@ Thu Feb 19 13:38:13 UTC 2015 - toms@opensuse.org
 -------------------------------------------------------------------
 Thu Sep 25 08:34:11 UTC 2014 - toms@opensuse.org
 
-Version 2.0 RC4:
+Version of the SUSE XSL stylesheets 2.0 RC4:
 - 2013 stylesheets:
   + Added feedback from linguistic review (thanks Patrick!)
   + Fixed intra book refs 
@@ -210,7 +254,7 @@ Version 2.0 RC4:
 -------------------------------------------------------------------
 Tue Sep 23 12:24:12 UTC 2014 - toms@opensuse.org
 
-Version 2.0 RC3:
+Version of the SUSE XSL stylesheets 2.0 RC3:
 - 2013 stylesheets
  + Reverted static-dir in HTML
  + Improved FO: guimenus for zh_*
@@ -228,7 +272,7 @@ Tue Aug 12 11:47:08 UTC 2014 - sknorr@suse.de
 -------------------------------------------------------------------
 Fri Jul 25 11:55:02 UTC 2014 - sknorr@suse.de
 
-Version 2.0 RC2:
+Version of the SUSE XSL stylesheets 2.0 RC2:
 - 2013 stylesheets
  + all: use simpler version.xsl file
  + all: more useful output for ulinks that only have a space character

suse-xsl-stylesheets.spec

@@ -17,7 +17,7 @@
 
 
 Name:           suse-xsl-stylesheets
-Version:        2.0.5
+Version:        2.0.6
 Release:        0
 
 ###############################################################
@@ -33,18 +33,10 @@ Release:        0
 #
 ################################################################
 
-%define novdocversion   1.0
+%define dbstyles          %{_datadir}/xml/docbook/stylesheet/nwalsh/current
-%define novdocname      novdoc
+%define susexsl_catalog   catalog-for-%{name}.xml
-%define regcat          %{_bindir}/sgml-register-catalog
+%define db_xml_dir        %{_datadir}/xml/docbook
-%define dbstyles        %{_datadir}/xml/docbook/stylesheet/nwalsh/current
+%define suse_styles_dir   %{db_xml_dir}/stylesheet
-%define suse_schemas_catalog catalog-for-suse_schemas.xml
-%define susexsl_catalog      catalog-for-%{name}.xml
-%define suse_schemas_groupname suse_schemas
-
-%define suse_xml_dir    %{_datadir}/xml/suse
-%define db_xml_dir      %{_datadir}/xml/docbook
-%define suse_schema_dir %{suse_xml_dir}/schema
-%define suse_styles_dir %{db_xml_dir}/stylesheet
 
 Summary:        SUSE-Branded Stylesheets for DocBook
 License:        GPL-2.0 or GPL-3.0
@@ -77,62 +69,52 @@ Requires:       docbook-xsl-stylesheets >= 1.77
 Requires:       docbook5-xsl-stylesheets >= 1.77
 
 Requires:       libxslt
+Requires:       aspell-en
 
 Recommends:     daps
 
+
 #------
 # Fonts
 #------
-%if 0%{?suse_version} >= 1220
+
-Requires:       dejavu-fonts
+# Western fallback: currently necessary for building with XEP, it seems.
+Requires:       ghostscript-fonts-std
+
+# Western fallback 2: These should make the Ghostscript fonts unnecessary.
 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:     aspell aspell-en
-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}
+# "Generic" font for use in cases where we don't want one of the gnu-free-fonts
-Recommends:     ttf-founder-simplified
+Requires:       dejavu-fonts
-%endif
 
-# FONTS USED IN suse2013 STYLESHEETS
+# FONTS USED IN "suse" (aka "suse2005") STYLESHEETS
-# A rather simplistic solution which roughly means that you need M17N:fonts to
+# Proprietary Western:
-# build the new stylesheets on older OS's.
+Recommends:     agfa-fonts
-%if 0%{?suse_version} >= 1220
+# Fallback for proprietary Western:
+Requires:       liberation-fonts
+# Japanese:
+Requires:       sazanami-fonts
+# Korean:
+Requires:       un-fonts
+# Chinese:
+Requires:       wqy-microhei-fonts
+
+
+# FONTS USED IN "suse2013" STYLESHEETS
+# Western fonts:
 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 required
-# Chinese simplified -- wqy-microhei-fonts, already recommended
 # Chinese traditional:
-Recommends:     arphic-uming-fonts
+Requires:       arphic-uming-fonts
 # Japanese:
-Recommends:     ipa-pgothic-fonts
+Requires:       ipa-pgothic-fonts
-Recommends:     ipa-pmincho-fonts
+Requires:       ipa-pmincho-fonts
-# Korean:
+# Korean -- un-fonts, already required
-Recommends:     nanum-fonts
 # Arabic:
-Recommends:     arabic-amiri-fonts
+Requires:       arabic-amiri-fonts
 
 
 %description
@@ -161,28 +143,17 @@ make install DESTDIR=$RPM_BUILD_ROOT  LIBDIR=%_libdir
 
 #----------------------
 %post
-# register catalogs
-#
-# SGML CATALOG
-#
-if [ -x %{regcat} ]; then
-  %{regcat} -a %{_datadir}/sgml/CATALOG.%{novdocname}-%{novdocversion} >/dev/null 2>&1 || true
-fi
 # XML Catalogs
 #
 # remove existing entries first - needed for
 # zypper in, since it does not call postun
 # delete ...
 if [ "2" = "$1" ]; then
- edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
-  --del %{suse_schemas_groupname} || true
  edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
   --del %{name} || true
 fi
 
 # ... and (re)add it again
-edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
-  --add %{_sysconfdir}/xml/%{suse_schemas_catalog}
 edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
   --add %{_sysconfdir}/xml/%{susexsl_catalog}
 
@@ -200,12 +171,6 @@ exit 0
 #
 if [ "0" = "$1" ]; then
   if [ ! -f %{_sysconfdir}/xml/%{suse_schemas_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then
-    # SGML: novdoc dtd entry
-    %{regcat} -r %{_datadir}/sgml/CATALOG.%{novdocname}-%{novdocversion} >/dev/null 2>&1 || true
-    # XML
-    # schemas entry
-    edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
-        --del %{suse_schemas_groupname}
     # susexsl entry
     edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
         --del %{name}
@@ -227,8 +192,6 @@ exit 0
 %dir %{_datadir}/suse-xsl-stylesheets
 %dir %{_datadir}/suse-xsl-stylesheets/aspell
 
-%dir %{suse_xml_dir}
-
 %dir %{suse_styles_dir}
 %dir %{suse_styles_dir}/suse
 %dir %{suse_styles_dir}/suse-ns
@@ -239,13 +202,6 @@ exit 0
 %dir %{suse_styles_dir}/opensuse2013
 %dir %{suse_styles_dir}/opensuse2013-ns
 
-%dir %{suse_schema_dir}
-%dir %{suse_schema_dir}/dtd
-%dir %{suse_schema_dir}/rng
-%dir %{suse_schema_dir}/dtd/1.0
-%dir %{suse_schema_dir}/rng/0.9
-%dir %{suse_schema_dir}/rng/1.0
-
 %dir %{_ttfontsdir}
 
 %dir %{_defaultdocdir}/%{name}
@@ -260,13 +216,7 @@ exit 0
 %{suse_styles_dir}/opensuse2013/*
 %{suse_styles_dir}/opensuse2013-ns/*
 
-# SUSE Schemas
-%{suse_schema_dir}/dtd/*
-%{suse_schema_dir}/rng/*
-
 # Catalogs
-%config /var/lib/sgml/CATALOG.*
-%{_datadir}/sgml/CATALOG.*
 %config %{_sysconfdir}/xml/*.xml
 
 # Fonts