From 8eb150b6da19997546d8e786cc51701016ce484bbe555226e4a8c90d6be9b7f3 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 24 Apr 2015 21:42:44 +0000 Subject: [PATCH] New release 2.0~rc5 New Features: * support for DocBook5 - the xsl-ns variants are located in the following directories: - /usr/share/xml/docbook/stylesheet/daps2013-ns - /usr/share/xml/docbook/stylesheet/opensuse2013-ns - /usr/share/xml/docbook/stylesheet/suse-ns - /usr/share/xml/docbook/stylesheet/suse2013-ns * the DocBook5 variants are automatically generated with a slghtly adopted version of xslns-build from upstream * SUSE aspell dictionary was moved from DAPS to this package; wordlist was updated * started a NovDoc version for DocBook 5: susedoc5 Bugfixes: * language fixes for Chinese, Korean, and Japanese * Fixed issue #29: Make Parameter runinhead.default.title.end.punct L10N Compatible * Fixed sf-issue #246 Allow More Information in Side Regions When in Draft Mode * Fixed sf-issue #243 Support Sorting of Acronym in Glossaries in HTML * Fixed sf-issue #241: Allow dir attribute in Novdoc DTD * Fixed bold.replacement.color and italic.replacement.color parameter for XEP * Fix for guimenus: Use 'inherit' instead of 'transparent' as this value seems not supported by XEP. * Novdoc: Missing remap for ulink added OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=88 --- suse-xsl-stylesheets-2.0~rc4.tar.bz2 | 4 +- suse-xsl-stylesheets-2.0~rc5.tar.bz2 | 3 + suse-xsl-stylesheets.changes | 30 +++++ suse-xsl-stylesheets.spec | 49 ++++--- susexsl-fetch-source-git | 125 ++++++++++++++++++ ...l-fetch-source => susexsl-fetch-source-svn | 0 6 files changed, 194 insertions(+), 17 deletions(-) create mode 100644 suse-xsl-stylesheets-2.0~rc5.tar.bz2 create mode 100644 susexsl-fetch-source-git rename susexsl-fetch-source => susexsl-fetch-source-svn (100%) diff --git a/suse-xsl-stylesheets-2.0~rc4.tar.bz2 b/suse-xsl-stylesheets-2.0~rc4.tar.bz2 index 5b0b14c..45f53c4 100644 --- a/suse-xsl-stylesheets-2.0~rc4.tar.bz2 +++ b/suse-xsl-stylesheets-2.0~rc4.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e61ccde10647f8de586f1bf48dabb317b7eceaa803cc22c3964b05047812f78 -size 1294620 +oid sha256:d1bdf3553c8244db043ea6d9a1f25acca4d3ef07ff30189d5cb8b618fc436ba0 +size 1583374 diff --git a/suse-xsl-stylesheets-2.0~rc5.tar.bz2 b/suse-xsl-stylesheets-2.0~rc5.tar.bz2 new file mode 100644 index 0000000..c197aa8 --- /dev/null +++ b/suse-xsl-stylesheets-2.0~rc5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a38838b093b22c143909967f0288a38242f96a54f9393066b05027edb78de8c2 +size 1598664 diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes index c434578..3dc7bc7 100644 --- a/suse-xsl-stylesheets.changes +++ b/suse-xsl-stylesheets.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Fri Apr 24 20:52:45 UTC 2015 - fsundermeyer@opensuse.org + +New release 2.0~rc5 + +New Features: + * support for DocBook5 - the xsl-ns variants are located in the following + directories: + - /usr/share/xml/docbook/stylesheet/daps2013-ns + - /usr/share/xml/docbook/stylesheet/opensuse2013-ns + - /usr/share/xml/docbook/stylesheet/suse-ns + - /usr/share/xml/docbook/stylesheet/suse2013-ns + * the DocBook5 variants are automatically generated with a slghtly adopted + version of xslns-build from upstream + * SUSE aspell dictionary was moved from DAPS to this package; wordlist + was updated + * started a NovDoc version for DocBook 5: susedoc5 + +Bugfixes: + * language fixes for Chinese, Korean, and Japanese + * Fixed issue #29: Make Parameter runinhead.default.title.end.punct + L10N Compatible + * Fixed sf-issue #246 Allow More Information in Side Regions When in Draft Mode + * Fixed sf-issue #243 Support Sorting of Acronym in Glossaries in HTML + * Fixed sf-issue #241: Allow dir attribute in Novdoc DTD + * Fixed bold.replacement.color and italic.replacement.color parameter for XEP + * Fix for guimenus: Use 'inherit' instead of 'transparent' as this value + seems not supported by XEP. + * Novdoc: Missing remap for ulink added + ------------------------------------------------------------------- Thu Feb 19 13:38:13 UTC 2015 - toms@opensuse.org diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec index 785ab46..dff52a9 100644 --- a/suse-xsl-stylesheets.spec +++ b/suse-xsl-stylesheets.spec @@ -1,7 +1,7 @@ # # spec file for package suse-xsl-stylesheets # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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~rc4 +Version: 2.0~rc5 Release: 0 ############################################################### @@ -45,11 +45,14 @@ License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/XML Url: http://sourceforge.net/p/daps/suse-xslt Source0: %{name}-%{version}.tar.bz2 -Source1: susexsl-fetch-source -Source2: %{name}.rpmlintrc +Source1: susexsl-fetch-source-svn +Source2: susexsl-fetch-source-git +Source3: %{name}.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: aspell +BuildRequires: aspell-en BuildRequires: docbook-xsl-stylesheets >= 1.77 BuildRequires: fdupes BuildRequires: libxslt @@ -58,6 +61,7 @@ BuildRequires: make %if 0%{?suse_version} == 1210 BuildRequires: xerces-j2 %endif +BuildRequires: fontpackages-devel BuildRequires: trang Requires: docbook-xsl-stylesheets >= 1.77 @@ -84,6 +88,7 @@ Recommends: un-fonts Requires: dejavu Requires: freefont Requires: liberation-fonts +Recommends: aspell aspell-en Recommends: agfa-fonts # Japanese: Recommends: sazanami-fonts @@ -134,16 +139,6 @@ the DocBook 4 DTD. #-------------------------------------------------------------------------- %prep %setup -q -n %{name} -# -# Patch the VERSION.xsl file to hold the current version -# FIXME: this is not the right place for these sed lines -- if anyone ever -# creates e.g. a Debian package, these would lines would have to be -# duplicated in the DEB equivalent of a spec file. This should be in -# ../Makefile instead. -sed -i "s/@@#version@@/%{version}/" xslt2005/version.xsl -sed -i "s/@@#version@@/%{version}/" suse2013/version.xsl -sed -i "s/@@#version@@/%{version}/" daps2013/version.xsl -sed -i "s/@@#version@@/%{version}/" opensuse2013/version.xsl #-------------------------------------------------------------------------- %build @@ -151,7 +146,7 @@ sed -i "s/@@#version@@/%{version}/" opensuse2013/version.xsl #-------------------------------------------------------------------------- %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir} @@ -183,6 +178,7 @@ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{susexsl_catalog} +%reconfigure_fonts_post exit 0 #---------------------- @@ -206,32 +202,49 @@ if [ "0" = "$1" ]; then edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --del %{name} fi + %reconfigure_fonts_post fi exit 0 +#---------------------- +%posttrans +%reconfigure_fonts_posttrans + #---------------------- %files %defattr(-,root,root) # 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 %{_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}/* @@ -242,9 +255,15 @@ exit 0 %{_datadir}/sgml/CATALOG.* %config %{_sysconfdir}/xml/*.xml +# Fonts +%{_ttfontsdir}/* + # Documentation %doc %{_defaultdocdir}/%{name}/* +# SUSE aspell dictionary +%{_datadir}/suse-xsl-stylesheets/aspell/en_US-suse-addendum.rws + #---------------------- %changelog diff --git a/susexsl-fetch-source-git b/susexsl-fetch-source-git new file mode 100644 index 0000000..87215f7 --- /dev/null +++ b/susexsl-fetch-source-git @@ -0,0 +1,125 @@ +#!/bin/bash +# +# +# Create suse-xsl source tarball from GitHub +# Needed because we would like to exclude unnecessary stuff from +# the source RPM in order to keep it lean +# +# Copyright (C) 2015 SUSE Linux GmbH +# +# Author: +# Frank Sundermeyer +# + +NAME=suse-xsl +PNAME=suse-xsl-stylesheets +VERSION= +SPECFILE=${PNAME}.spec +TMPDIR=$(mktemp -q -d --tmpdir susexsl_XXXXXXXX) + +#---------- +# Functions +#---------- + +# exit on error +# +function exit_on_error { + echo -e "$1" +# rm -rf $TMPDIR + exit 1 +} + +function help { + echo -e "$(basename $0) \n" +} + +#----- +# MAIN +#----- +# +# Check for archive file name +# +if [[ -z $1 ]]; then + exit_on_error "Please specify a URl for a suse-xsl release archive on Github, e.g.\https://github.com/openSUSE/suse-xsl/archive/2.0-rc5.tar.gz" +else + ARCHIVE_URL="$1" + ARCHIVE_NAME="${ARCHIVE_URL##*/}" +fi + +# This script needs to be called from the osc checkout directory, so +# lets check whether we are in the correct directory +# +if [[ ! -s $SPECFILE && ! -d .osc ]]; then + echo "Looks like you are not in the suse-xsl checkout directory." + read -p "Continue anyway (y/n) [n]: " CONT + if [[ n = $CONT || N = $CONT ]]; then + exit_on_error "Aborted by user." + fi +fi + +#----------- +# Download archive +# +echo "Downloading archive:" +(cd $TMPDIR && wget -nv $ARCHIVE_URL) || exit_on_error "Download of $ARCHIVE_URL failed" + +#----------- +# 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 + +(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*//') + +if [[ -z $VERSION ]]; then + exit_on_error "Couldn't get version number from spec-file." +fi + +#----------- +# 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 + +echo "Successfully wrote source tarball ${NAME}-${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." +fi + +#rm -rf ${TMPDIR} + +exit 0 diff --git a/susexsl-fetch-source b/susexsl-fetch-source-svn similarity index 100% rename from susexsl-fetch-source rename to susexsl-fetch-source-svn