Hello community,
here is the log from the commit of package suse-xsl-stylesheets for
openSUSE:Factory checked in at 2015-07-05 17:58:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-xsl-stylesheets"
Changes:
--------
---
/work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes
2015-05-06 07:47:19.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes
2015-07-05 17:58:42.000000000 +0200
@@ -1,0 +2,36 @@
+Thu Jul 2 07:48:22 UTC 2015 - [email protected]
+
+Stable release 2.0.1
+
+- Schema
+ . Enabled subtitle and textobject (susedoc5.rnc)
+
+- Stylesheets
+ . Changed bugzilla component to 'Documentation' for SLERT
+ (suse2013/static/js/script.js)
+ . Added missing subtitle for articles
+ suse2013/fo/article.titlepage.templates.xsl
+
+- Infrastructure
+ . Trying to fix an undef value error (bin/xslns-build)
+
+-------------------------------------------------------------------
+Fri Jun 19 12:47:56 UTC 2015 - [email protected]
+
+Stable release 2.0
+
+- added latest products to .js file to create correct Bugzilla
+ links in Draft mode
+
+-------------------------------------------------------------------
+Thu Jun 11 13:55:14 UTC 2015 - [email protected]
+
+New release 2.0-rc6:
+
+* added SUSEdoc, a fully DocBook 5 compatible schema with a subset
+ of DocBook commands (like NovDoc for DocBook 4)
+* package now supports installation of different schema/DTD versions
+ in parallel
+* schemas are located at /usr/share/xml/suse/schema
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-stylesheets-2.0~rc5.tar.bz2
New:
----
suse-xsl-stylesheets-2.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.cL2CRm/_old 2015-07-05 17:58:43.000000000 +0200
+++ /var/tmp/diff_new_pack.cL2CRm/_new 2015-07-05 17:58:43.000000000 +0200
@@ -17,7 +17,7 @@
Name: suse-xsl-stylesheets
-Version: 2.0~rc5
+Version: 2.0.1
Release: 0
###############################################################
@@ -33,12 +33,18 @@
#
################################################################
-%define dtdversion 1.0
-%define dtdname novdoc
+%define novdocversion 1.0
+%define novdocname novdoc
%define regcat %{_bindir}/sgml-register-catalog
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
-%define novdoc_catalog for-catalog-%{dtdname}-%{dtdversion}.xml
-%define susexsl_catalog for-catalog-%{name}.xml
+%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 Docbook stylesheets for XSLT 1.0
License: GPL-2.0 or GPL-3.0
@@ -134,7 +140,7 @@
Extensions for the DocBook XSLT 1.0 stylesheets that provide SUSE branding
for PDF, HTML, and ePUB. This package also provides the NovDoc DTD, a subset of
-the DocBook 4 DTD.
+the DocBook 4 DTD and SUSEdoc, a subset of the DocBook 5 schema.
#--------------------------------------------------------------------------
%prep
@@ -158,7 +164,7 @@
# SGML CATALOG
#
if [ -x %{regcat} ]; then
- %{regcat} -a %{_datadir}/sgml/CATALOG.%{dtdname}-%{dtdversion} >/dev/null
2>&1 || true
+ %{regcat} -a %{_datadir}/sgml/CATALOG.%{novdocname}-%{novdocversion}
>/dev/null 2>&1 || true
fi
# XML Catalogs
#
@@ -166,17 +172,17 @@
# zypper in, since it does not call postun
# delete ...
if [ "2" = "$1" ]; then
- edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
- --del %{dtdname}-%{dtdversion} || true
- edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+ 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 /etc/xml/suse-catalog.xml \
- --add /etc/xml/%{novdoc_catalog}
-edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
- --add /etc/xml/%{susexsl_catalog}
+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}
%reconfigure_fonts_post
exit 0
@@ -191,15 +197,15 @@
# in case of an update
#
if [ "0" = "$1" ]; then
- if [ ! -f %{_sysconfdir}/xml/%{novdoc_catalog} -a -x
/usr/bin/edit-xml-catalog ] ; 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.%{dtdname}-%{dtdversion} >/dev/null
2>&1 || true
+ %{regcat} -r %{_datadir}/sgml/CATALOG.%{novdocname}-%{novdocversion}
>/dev/null 2>&1 || true
# XML
- # novdoc dtd entry
- edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
- --del %{dtdname}-%{dtdversion}
+ # schemas entry
+ edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
+ --del %{suse_schemas_groupname}
# susexsl entry
- edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+ edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--del %{name}
fi
%reconfigure_fonts_post
@@ -218,37 +224,43 @@
# Directories
%dir %{_datadir}/suse-xsl-stylesheets
%dir %{_datadir}/suse-xsl-stylesheets/aspell
-%dir %{_datadir}/xml/docbook/stylesheet/suse
-%dir %{_datadir}/xml/docbook/stylesheet/suse-ns
-%dir %{_datadir}/xml/docbook/stylesheet/suse2013
-%dir %{_datadir}/xml/docbook/stylesheet/suse2013-ns
-%dir %{_datadir}/xml/docbook/stylesheet/daps2013
-%dir %{_datadir}/xml/docbook/stylesheet/daps2013-ns
-%dir %{_datadir}/xml/docbook/stylesheet/opensuse2013
-%dir %{_datadir}/xml/docbook/stylesheet/opensuse2013-ns
-
-%dir %{_datadir}/xml/%{dtdname}
-%dir %{_datadir}/xml/%{dtdname}/schema
-%dir %{_datadir}/xml/%{dtdname}/schema/*
-%dir %{_datadir}/xml/%{dtdname}/schema/*/%{dtdversion}
+
+%dir %{suse_xml_dir}
+
+%dir %{suse_styles_dir}
+%dir %{suse_styles_dir}/suse
+%dir %{suse_styles_dir}/suse-ns
+%dir %{suse_styles_dir}/suse2013
+%dir %{suse_styles_dir}/suse2013-ns
+%dir %{suse_styles_dir}/daps2013
+%dir %{suse_styles_dir}/daps2013-ns
+%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}
# stylesheets
-%{_datadir}/xml/docbook/stylesheet/suse/*
-%{_datadir}/xml/docbook/stylesheet/suse-ns/*
-%{_datadir}/xml/docbook/stylesheet/suse2013/*
-%{_datadir}/xml/docbook/stylesheet/suse2013-ns/*
-%{_datadir}/xml/docbook/stylesheet/daps2013/*
-%{_datadir}/xml/docbook/stylesheet/daps2013-ns/*
-%{_datadir}/xml/docbook/stylesheet/opensuse2013/*
-%{_datadir}/xml/docbook/stylesheet/opensuse2013-ns/*
-
-# NovDoc Schemas
-%{_datadir}/xml/%{dtdname}/schema/dtd/%{dtdversion}/*
-%{_datadir}/xml/%{dtdname}/schema/rng/%{dtdversion}/*
+%{suse_styles_dir}/suse/*
+%{suse_styles_dir}/suse-ns/*
+%{suse_styles_dir}/suse2013/*
+%{suse_styles_dir}/suse2013-ns/*
+%{suse_styles_dir}/daps2013/*
+%{suse_styles_dir}/daps2013-ns/*
+%{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.*
++++++ suse-xsl-stylesheets-2.0~rc5.tar.bz2 ->
suse-xsl-stylesheets-2.0.1.tar.bz2 ++++++
++++ 7964 lines of diff (skipped)
++++++ susexsl-fetch-source-git ++++++
--- /var/tmp/diff_new_pack.cL2CRm/_old 2015-07-05 17:58:44.000000000 +0200
+++ /var/tmp/diff_new_pack.cL2CRm/_new 2015-07-05 17:58:44.000000000 +0200
@@ -10,6 +10,7 @@
# Author:
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#
+#
NAME=suse-xsl
PNAME=suse-xsl-stylesheets
@@ -33,6 +34,35 @@
echo -e "$(basename $0) <ARCHIVE_FILENAME>\n"
}
+function download_archive {
+ echo "Downloading archive:"
+ (cd $TMPDIR && wget -nv $ARCHIVE_URL) || exit_on_error "Download of
$ARCHIVE_URL failed"
+}
+
+function copy_archive {
+ echo "Copying archive:"
+ cp -v $ARCHIVE_URL $TMPDIR || exit_on_error "Copying of $ARCHIVE_URL failed"
+}
+
+function unpack_archive {
+case ${ARCHIVE_NAME##*.} in
+ zip)
+ UNPACK="unzip"
+ ARCHIVE_DIR=$(basename $ARCHIVE_NAME .zip)
+ ;;
+ gz)
+ UNPACK="tar xfz"
+ ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.gz)
+ ;;
+ bz2)
+ UNPACK="tar xfj"
+ ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.bz2)
+ ;;
+ *)
+ exit_on_error "Unknown archive format"
+esac
+}
+
#-----
# MAIN
#-----
@@ -60,29 +90,19 @@
#-----------
# Download archive
#
-echo "Downloading archive:"
-(cd $TMPDIR && wget -nv $ARCHIVE_URL) || exit_on_error "Download of
$ARCHIVE_URL failed"
+
+if [[ ${ARCHIVE_URL} == http* ]]; then
+ download_archive
+ unpack_archive
+else
+ copy_tar
+fi
#-----------
# Unpack archive
#
-case ${ARCHIVE_NAME##*.} in
- zip)
- UNPACK="unzip"
- ARCHIVE_DIR=$(basename $ARCHIVE_NAME .zip)
- ;;
- gz)
- UNPACK="tar xfz"
- ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.gz)
- ;;
- bz2)
- UNPACK="tar xfj"
- ARCHIVE_DIR=$(basename $ARCHIVE_NAME .tar.bz2)
- ;;
- *)
- exit_on_error "Unknown archive format"
-esac
+
SRC_DIR=${TMPDIR}/${PNAME}
EXCLUDES=${SRC_DIR}/packaging/exclude-files_for_susexsl_package.txt
