Hello community,
here is the log from the commit of package suse-xsl-stylesheets for
openSUSE:Factory checked in at 2015-05-06 07:47:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-27 10:56:42.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes
2015-05-06 07:47:19.000000000 +0200
@@ -1,0 +2,35 @@
+Mon Apr 27 12:00:09 UTC 2015 - [email protected]
+
+- fix for rpm installation error
+
+-------------------------------------------------------------------
+Fri Apr 24 20:52:45 UTC 2015 - [email protected]
+
+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
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-stylesheets-2.0~rc4.tar.bz2
susexsl-fetch-source
New:
----
suse-xsl-stylesheets-2.0~rc5.tar.bz2
susexsl-fetch-source-git
susexsl-fetch-source-svn
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.JvTluU/_old 2015-05-06 07:47:20.000000000 +0200
+++ /var/tmp/diff_new_pack.JvTluU/_new 2015-05-06 07:47:20.000000000 +0200
@@ -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 @@
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 @@
%if 0%{?suse_version} == 1210
BuildRequires: xerces-j2
%endif
+BuildRequires: fontpackages-devel
BuildRequires: trang
Requires: docbook-xsl-stylesheets >= 1.77
@@ -84,6 +88,7 @@
Requires: dejavu
Requires: freefont
Requires: liberation-fonts
+Recommends: aspell aspell-en
Recommends: agfa-fonts
# Japanese:
Recommends: sazanami-fonts
@@ -134,16 +139,6 @@
#--------------------------------------------------------------------------
%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 @@
#--------------------------------------------------------------------------
%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 \
--add /etc/xml/%{susexsl_catalog}
+%reconfigure_fonts_post
exit 0
#----------------------
@@ -206,32 +202,49 @@
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 @@
%{_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
++++++ suse-xsl-stylesheets-2.0~rc4.tar.bz2 ->
suse-xsl-stylesheets-2.0~rc5.tar.bz2 ++++++
++++ 202821 lines of diff (skipped)
++++++ susexsl-fetch-source-git ++++++
#!/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 <fsundermeyer at opensuse dot org>
#
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) <ARCHIVE_FILENAME>\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
++++++ susexsl-fetch-source-svn ++++++
#!/bin/bash
#
# Create suse-xsl-stylesheet source tarball from SVN
#
# Copyright (C) 2011,2012 Frank Sundermeyer <[email protected]>
#
# Author:
# Frank Sundermeyer <[email protected]>
#set -x
NAME=suse-xsl-stylesheets
VERSION=
SPECFILE=${NAME}.spec
SRC_DIR=suse
NOVDOC_DIR=schema
SVNPATH=svn://svn.code.sf.net/p/daps/svn/trunk/daps
TMPDIR=$(mktemp -q -d --tmpdir susexsl_XXXXXXXX)
EXCLUDES=${TMPDIR}/${NAME}/${SRC_DIR}/packaging/exclude-files_for_susexsl_package.txt
#----------
# Functions
#----------
# exit on error
#
function exit_on_error {
echo -e "$1"
#rm -rf $TMPDIR
exit 1
}
#-----
# MAIN
#-----
#
# This script needs to be called from the suse-xsl-stylesheet osc checkout
# directory, so lets check whethter we are in the correct directory
#
if [[ ! -s ${NAME}.spec && ! -d .osc ]]; then
echo "Looks like you are not in the ${NAME} checkout directory."
read -p "Continue anyway (y/n) [n]: " CONT
if [[ n = $CONT || N = $CONT ]]; then
exit_on_error "Aborted by user."
fi
fi
#
# Export daps from SVN
#
svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"
#
# Get the version number
#
VERSION=$(egrep "^Version:\s*" ${TMPDIR}/${NAME}/${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 cfh ${NAME}-${VERSION}.tar -C ${TMPDIR}/${NAME} \
--exclude-from=$EXCLUDES --transform=s:suse/:suse-xsl-stylesheets/: \
${SRC_DIR} || exit_on_error "Failed to create the tarball."
# suse/aspell is excluded from tarball, because we only need one file, which we
# manually add here
tar rf ${NAME}-${VERSION}.tar -C ${TMPDIR}/${NAME} \
--transform=s:suse:suse-xsl-stylesheets: \
${SRC_DIR}/aspell/suse_aspell.rws || exit_on_error "Failed to add aspell
dictionary to the tarball."
bzip2 -9f ${NAME}-${VERSION}.tar
echo "Successfully created ${NAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
diff -q $SPECFILE ${TMPDIR}/${NAME}/${SRC_DIR}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
echo "spec file is up-to-date"
else
cp ${TMPDIR}/${NAME}/${SRC_DIR}/packaging/$SPECFILE . || exit_on_error
"Failed to copy the specfile."
echo "Successfully updated the spec file."
fi
rm -rf ${TMPDIR}
exit 0
