Accepting request 427975 from Documentation:Tools

OBS-URL: https://build.opensuse.org/request/show/427975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-xsl-stylesheets?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2016-09-20 11:21:23 +00:00 committed by Git OBS Bridge
commit ed349e91b7
5 changed files with 59 additions and 46 deletions

View File

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

View File

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

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu Sep 15 15:06:10 UTC 2016 - sknorr@suse.com
Stable release of the SUSE XSL stylesheets 2.0.6.2:
Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER
* Packaging
- Fixed post/postun segments of spec file
* SUSE Word List for aspell
- Added more words
* Stylesheets (common)
- Added VERSION.xsl for suse2005 stylesheets
* Stylesheets (PDF)
- Removed duplicate fo:markers that led to build errors with XEP
(suse-xsl #260)
* Stylesheets (XHTML)
- Fixed embedded JavaScript, removed old Chrome/Android quirk
- Fixed embedding of branding CSS
-------------------------------------------------------------------
Thu Aug 4 18:37:24 UTC 2016 - sknorr@suse.com
@ -9,6 +34,8 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER
* Stylesheets (XHTML)
- Fixed style of <section><title> elements
- Turned off syntax highlighting in cases where it is unexpected
- Made syntax highlighting functional with openSUSE and DAPS
brandings
-------------------------------------------------------------------
Mon Aug 1 15:30:00 UTC 2016 - sknorr@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package suse-xsl-stylesheets
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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,24 +17,23 @@
Name: suse-xsl-stylesheets
Version: 2.0.6.1
Version: 2.0.6.2
Release: 0
###############################################################
#
# ATTENTION: Do NOT edit this file outside of
# https://svn.code.sf.net/p/daps/svn/trunk/daps/\
# suse/packaging/suse-xsl-stylesheets.spec
# IMPORTANT:
# Only edit this file directly in the Git repo:
# https://github.com/openSUSE/daps, branch develop,
# packaging/suse-xsl-stylesheets.spec
#
# Your changes will be lost on the next update
# If you do not have access to the SVN repository, notify
# Your changes will be lost on the next update.
# If you do not have access to the Git repository, notify
# <fsundermeyer@opensuse.org> and <toms@opensuse.org>
# or send a patch
# or send a patch.
#
################################################################
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
%define susexsl_catalog catalog-for-%{name}.xml
%define db_xml_dir %{_datadir}/xml/docbook
%define suse_styles_dir %{db_xml_dir}/stylesheet
@ -67,7 +66,6 @@ Requires: docbook_4
Requires: docbook_5
Requires: docbook-xsl-stylesheets >= 1.77
Requires: docbook5-xsl-stylesheets >= 1.77
Requires: libxslt
Requires: aspell-en
@ -80,10 +78,8 @@ Recommends: daps
# 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
# "Generic" font for use in cases where we don't want one of the gnu-free-fonts
Requires: dejavu-fonts
@ -99,7 +95,6 @@ Requires: un-fonts
# Chinese:
Requires: wqy-microhei-fonts
# FONTS USED IN "suse2013" STYLESHEETS
# Western fonts:
Requires: google-opensans-fonts
@ -127,64 +122,52 @@ use: The NovDoc DTD, a subset of the DocBook 4 DTD and the SUSEdoc schema, a
subset of the DocBook 5 schema.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
#--------------------------------------------------------------------------
%build
%__make %{?_smp_mflags}
#--------------------------------------------------------------------------
%install
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
# create symlinks:
%fdupes -s $RPM_BUILD_ROOT/%{_datadir}
%fdupes -s %{buildroot}/%{_datadir}
#----------------------
%post
# 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 %{name} || true
fi
# ... and (re)add it again
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--add %{_sysconfdir}/xml/%{susexsl_catalog}
%reconfigure_fonts_post
if [ ! -f %{_sysconfdir}/xml/suse-catalog.xml -a -x %{_bindir}/edit-xml-catalog ] ; then
# susexsl entry
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--del %{name}
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--del suse_schemas
fi
exit 0
#----------------------
%postun
#
# Remove catalog entries
#
# delete catalog entries
# only run if package is really uninstalled ($1 = 0) and not
# in case of an update
#
if [ "0" = "$1" ]; then
if [ ! -f %{_sysconfdir}/xml/%{suse_schemas_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then
# susexsl entry
edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
--del %{name}
fi
%reconfigure_fonts_post
fi
exit 0
#----------------------
%posttrans
%reconfigure_fonts_posttrans
#----------------------
%files
%defattr(-,root,root)

View File

@ -70,7 +70,10 @@ esac
# 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"
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. Alternatively, use --tag [TAG_NAME]."
elif [[ $1 = '--tag' ]] && [[ $2 ]]; then
ARCHIVE_URL="https://github.com/openSUSE/suse-xsl/archive/$2.tar.gz"
ARCHIVE_NAME="${ARCHIVE_URL##*/}"
else
ARCHIVE_URL="$1"
ARCHIVE_NAME="${ARCHIVE_URL##*/}"