1
0

Stable release of the SUSE XSL stylesheets 2.0.8:

Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER
PDF only:
* Support footnotes, requested by Stefan Quandt
  (suse-xsl #313, suse-xsl #314)
* No colons after type/number in languages other than English
  (suse-xsl #334)
HTML only:
* Glossdiv Title: rendered in gray instead of green
  (suse-xsl #350)
PDF/HTML:
* No more spaces at the end of titles in formalparas
  (suse-xsl #288)
* Intra xref to step doesn't work (suse-xsl #343)
I18N:
* ja: don't generate the word "book" in intra-xrefs (suse-xsl #323)
* Correct German quotes (suse-xsl #324, suse-xsl #340)
* glossseealso: "See Also" -> "See also" (suse-xsl #330)
General:
* Exclude drupal and db2mediawiki stylesheets as they are now
  obsolete (suse-xsl #310, suse-xsl #312)
* Check length of text content in screen (suse-xsl #328)
* Validate stylesheets through Jing in Travis (suse-xsl #327,
  suse-xsl #337, suse-xsl #342)
Project/Spec File:
* Use catalog.d mechanism and remove old XML catalog files, see
  https://en.opensuse.org/openSUSE:Packaging_XML_Schemas_and_Stylesheets#Add_XML_Catalog_Support
* Fix susexsl-fetch-source-git script:

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=115
This commit is contained in:
Thomas Schraitle 2017-09-28 15:57:44 +00:00 committed by Git OBS Bridge
parent e87f8b37a5
commit aff04e7652
6 changed files with 95 additions and 39 deletions

View File

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

View File

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

View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Thu Sep 28 08:12:14 UTC 2017 - thomas.schraitle@suse.com
Stable release of the SUSE XSL stylesheets 2.0.8:
Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER
PDF only:
* Support footnotes, requested by Stefan Quandt
(suse-xsl #313, suse-xsl #314)
* No colons after type/number in languages other than English
(suse-xsl #334)
HTML only:
* Glossdiv Title: rendered in gray instead of green
(suse-xsl #350)
PDF/HTML:
* No more spaces at the end of titles in formalparas
(suse-xsl #288)
* Intra xref to step doesn't work (suse-xsl #343)
I18N:
* ja: don't generate the word "book" in intra-xrefs (suse-xsl #323)
* Correct German quotes (suse-xsl #324, suse-xsl #340)
* glossseealso: "See Also" -> "See also" (suse-xsl #330)
General:
* Exclude drupal and db2mediawiki stylesheets as they are now
obsolete (suse-xsl #310, suse-xsl #312)
* Check length of text content in screen (suse-xsl #328)
* Validate stylesheets through Jing in Travis (suse-xsl #327,
suse-xsl #337, suse-xsl #342)
Project/Spec File:
* Use catalog.d mechanism and remove old XML catalog files, see
https://en.opensuse.org/openSUSE:Packaging_XML_Schemas_and_Stylesheets#Add_XML_Catalog_Support
* Fix susexsl-fetch-source-git script:
* Set timeout for wget
* Distinguish between detect an archive and extract one
* Make extraction more robust
-------------------------------------------------------------------
Fri Jun 16 11:19:51 UTC 2017 - sknorr@suse.com

View File

@ -1,2 +1,3 @@
addFilter("explicit-lib-dependency libxslt")
addFilter("explicit-lib-dependency liberation-fonts")
addFilter("incorrect-fsf-address .*/hyphen/czhyphen.il2")

View File

@ -1,7 +1,7 @@
#
# spec file for package suse-xsl-stylesheets
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: suse-xsl-stylesheets
Version: 2.0.7.2
Version: 2.0.8
Release: 0
###############################################################
@ -63,14 +63,17 @@ BuildRequires: xerces-j2
BuildRequires: fontpackages-devel
BuildRequires: trang
# docbook_4/docbook_5 are required to be able to transform DocBook documents
# that use predefined DocBook entities.
Requires: docbook_4
Requires: docbook_5
Requires: docbook-xsl-stylesheets >= 1.77
Requires: docbook5-xsl-stylesheets >= 1.77
Requires: libxslt
Requires: aspell-en
Recommends: daps
Requires: sgml-skel >= 0.7
Requires(post): sgml-skel >= 0.7
Requires(postun): sgml-skel >= 0.7
#------
@ -138,41 +141,44 @@ stylesheets are based on the original DocBook XSLT 1.0 stylesheets.
#--------------------------------------------------------------------------
%install
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
# create symlinks:
%fdupes -s %{buildroot}/%{_datadir}
#----------------------
%post
# XML Catalogs
#
# remove existing entries first - needed for
# remove old 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 %{name} || true
fi
# ... and (re)add it again
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--add %{_sysconfdir}/xml/%{susexsl_catalog}
# ... and (re)add new catalogs
update-xml-catalog
%reconfigure_fonts_post
exit 0
#----------------------
%postun
update-xml-catalog
if [ "0" = "$1" ]; then
%reconfigure_fonts_post
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--del %{name} || true
fi
exit 0
#----------------------
%posttrans
@ -212,7 +218,7 @@ exit 0
%{suse_styles_dir}/opensuse2013-ns/*
# Catalogs
%config %{_sysconfdir}/xml/*.xml
%config %{_sysconfdir}/xml/catalog.d/%{name}.xml
# Fonts
%{_ttfontsdir}/*

View File

@ -36,7 +36,7 @@ function help {
function download_archive {
echo "Downloading archive:"
(cd $TMPDIR && wget -nv $ARCHIVE_URL) || exit_on_error "Download of $ARCHIVE_URL failed"
(cd $TMPDIR && wget --connect-timeout=10 -nv $ARCHIVE_URL) || exit_on_error "Download of $ARCHIVE_URL failed"
}
function copy_archive {
@ -44,7 +44,7 @@ function copy_archive {
cp -v $ARCHIVE_URL $TMPDIR || exit_on_error "Copying of $ARCHIVE_URL failed"
}
function unpack_archive {
function detect_archive {
case ${ARCHIVE_NAME##*.} in
zip)
UNPACK="unzip"
@ -63,6 +63,14 @@ case ${ARCHIVE_NAME##*.} in
esac
}
function unpack_archive {
SRC_DIR=${TMPDIR}/${PNAME}
pushd $TMPDIR
mkdir $PNAME
$UNPACK $ARCHIVE_NAME -C $PNAME --strip-components 1
[[ $? ]] || exit_on_error "Unpacking $ARCHIVE_NAME failed"
popd
}
#-----
# MAIN
#-----
@ -96,53 +104,49 @@ fi
if [[ ${ARCHIVE_URL} == http* ]]; then
download_archive
unpack_archive
else
copy_tar
copy_archive
fi
#-----------
# Unpack archive
#
detect_archive
unpack_archive
SRC_DIR=${TMPDIR}/${PNAME}
EXCLUDES=${SRC_DIR}/packaging/exclude-files_for_susexsl_package.txt
(cd $TMPDIR && $UNPACK $ARCHIVE_NAME) || exit_on_error "Unpacking $ARCHIVE_NAME failed"
mv ${TMPDIR}/${NAME}-${ARCHIVE_DIR}/ ${SRC_DIR}/
#-----------
# Get the version number
#
VERSION=$(egrep "^Version:\s*" ${SRC_DIR}/packaging/$SPECFILE | sed 's/^Version:\s*//')
VERSION=$(egrep "^Version:\s*" ./$SPECFILE | sed 's/^Version:\s*//')
if [[ -z $VERSION ]]; then
exit_on_error "Couldn't get version number from spec-file."
fi
echo "Detected version=$VERSION"
#-----------
# Create the tarball
#
export BZIP2=--best
tar cf ${PNAME}-${VERSION}.tar -C ${TMPDIR} \
--exclude-from=$EXCLUDES ${PNAME} || exit_on_error "Failed to create the tarball."
bzip2 -9 ${PNAME}-${VERSION}.tar
tar cf ${PNAME}-${VERSION}.tar -C ${TMPDIR} ${PNAME} || exit_on_error "Failed to create the tarball."
bzip2 ${PNAME}-${VERSION}.tar
echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2"
echo "Successfully wrote source tarball ${PNAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
diff -q $SPECFILE ${SRC_DIR}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
echo "Spec file is up-to-date."
else
cp ${SRC_DIR}/packaging/$SPECFILE . || exit_on_error "Failed to copy the specfile."
echo "Successfully updated the spec file."
if [[ -e ${SRC_DIR}/packaging/$SPECFILE ]]; then
diff -q $SPECFILE ${SRC_DIR}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
echo "Spec file is up-to-date."
else
cp ${SRC_DIR}/packaging/$SPECFILE . || exit_on_error "Failed to copy the specfile."
echo "Successfully updated the spec file."
fi
fi
#rm -rf ${TMPDIR}
exit 0