Accepting request 805691 from Documentation:Tools

OBS-URL: https://build.opensuse.org/request/show/805691
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-xsl-stylesheets?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2020-05-16 20:25:02 +00:00 committed by Git OBS Bridge
commit 2339ef23f0
6 changed files with 76 additions and 197 deletions

14
_service Normal file
View File

@ -0,0 +1,14 @@
<services>
<service name="tar_scm" mode="disabled">
<!-- Switcheroo below two lines before properly releasing! -->
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">git@github.com:openSUSE/suse-xsl.git</param>
<param name="scm">git</param>
<param name="revision">2.0.16</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

3
suse-xsl-2.0.16.tar.bz2 Normal file
View File

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

View File

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

View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Thu May 14 20:38:52 UTC 2020 - Stefan Knorr <sknorr@suse.com>
- Stable release of the SUSE XSL stylesheets 2.0.16:
https://github.com/openSUSE/suse-xsl/releases/tag/2.0.16
- General:
- Use consistent label for `question`s in `qandaentry`s
(bsc#1162324)
- HTML:
- Allow copying content of screens to the clipboard
- Support for issue templates in report-bug links
- Share buttons: Use LinkedIn instead of Google+, use oldschool
"mailto:" link instead of e-mail form on suse.com
- Fix issues where we got duplicate section/chapter IDs in HTML
output (#269)
- Add permalinks to more output elements (such as chapters)
- Add og:... tags to HTML pages, for improved social sharing
- Allow including external JS with new parameters external.js
(always include) and external.js.onlineonly (only include when
on non-"file:" URL)
- Stop relying on negative margins in CSS that were causing
overlaid elements and other ugly experience issue
- Fix closing behavior of mobile menu
- Minor CSS improvements
- Update SUSE footer link URLs
- Open clicked images in new tab/window by default
- Stop adding "Abstract" titles over abstracts
- PDF:
- Fix layout regressions that occurred after libxml bug fixes:
admon titles, book titles, imprint text (#369)
- Change imprint address to SUSE LLC Provo
- Other:
- Repo cleanup
- Makefile simplifications
- Set up .gitattributes for packaging
-------------------------------------------------------------------
Mon Nov 25 10:43:29 UTC 2019 - Thomas Schraitle <thomas.schraitle@suse.com> - 2.0.15

View File

@ -17,23 +17,10 @@
Name: suse-xsl-stylesheets
Version: 2.0.15
Version: 2.0.16
Release: 0
###############################################################
#
# 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 Git repository, notify
# <fsundermeyer@opensuse.org> and <toms@opensuse.org>
# or send a patch.
#
################################################################
%define reponame suse-xsl
%define susexsl_catalog catalog-for-%{name}.xml
%define db_xml_dir %{_datadir}/xml/docbook
%define suse_styles_dir %{db_xml_dir}/stylesheet
@ -42,8 +29,7 @@ Summary: SUSE-Branded Stylesheets for DocBook
License: GPL-2.0 or GPL-3.0
Group: Productivity/Publishing/XML
Url: https://github.com/openSUSE/suse-xsl
Source0: %{name}-%{version}.tar.bz2
Source1: susexsl-fetch-source-git
Source0: %{reponame}-%{version}.tar.bz2
Source2: %{name}.rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -54,10 +40,6 @@ BuildRequires: fdupes
BuildRequires: libxml2-tools
BuildRequires: libxslt
BuildRequires: make
# Only needed to fix the "have choice" error between xerces-j2 and crimson
%if 0%{?suse_version} == 1210
BuildRequires: xerces-j2
%endif
BuildRequires: fontpackages-devel
BuildRequires: trang
@ -73,9 +55,7 @@ Requires(post): sgml-skel >= 0.7
Requires(postun): sgml-skel >= 0.7
#------
# Fonts
#------
# FONTS
# Western fallback: currently necessary for building with XEP, it seems.
Requires: ghostscript-fonts-std
@ -97,7 +77,7 @@ Requires: un-fonts
# Chinese:
Requires: wqy-microhei-fonts
# FONTS USED IN "suse2013" STYLESHEETS
# FONTS USED IN "suse2013"/"opensuse2013"/"daps2013/"suse2020" STYLESHEETS
# Western fonts:
Requires: google-opensans-fonts
Requires: sil-charis-fonts
@ -119,17 +99,14 @@ These are SUSE-branded XSLT 1.0 stylesheets for DocBook 4 and 5 that are be used
to create the HTML, PDF, and EPUB versions of SUSE documentation. These
stylesheets are based on the original DocBook XSLT 1.0 stylesheets.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{reponame}-%{version}
#--------------------------------------------------------------------------
%build
%__make %{?_smp_mflags}
%__make %{?_smp_mflags}
#--------------------------------------------------------------------------
%install
make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
@ -137,20 +114,20 @@ make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
# create symlinks:
%fdupes -s %{buildroot}/%{_datadir}
#----------------------
%post
# XML Catalogs
#
# remove old existing entries first - needed for
# zypper in, since it does not call postun
# delete ...
# 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 new catalogs
# ... and (re)insert new catalogs
update-xml-catalog
%reconfigure_fonts_post
@ -170,17 +147,14 @@ fi
exit 0
#----------------------
%posttrans
%reconfigure_fonts_posttrans
#----------------------
%files
%defattr(-,root,root)
# Directories
# directories
%dir %{suse_styles_dir}
%dir %{suse_styles_dir}/suse
%dir %{suse_styles_dir}/suse-ns
@ -190,6 +164,8 @@ exit 0
%dir %{suse_styles_dir}/daps2013-ns
%dir %{suse_styles_dir}/opensuse2013
%dir %{suse_styles_dir}/opensuse2013-ns
#%dir %{suse_styles_dir}/suse2020
#%dir %{suse_styles_dir}/suse2020-ns
%dir %{_ttfontsdir}
@ -204,16 +180,17 @@ exit 0
%{suse_styles_dir}/daps2013-ns/*
%{suse_styles_dir}/opensuse2013/*
%{suse_styles_dir}/opensuse2013-ns/*
#%{suse_styles_dir}/suse2020/*
#%{suse_styles_dir}/suse2020-ns/*
# Catalogs
# catalogs
%config %{_sysconfdir}/xml/catalog.d/%{name}.xml
# Fonts
# fonts
%{_ttfontsdir}/*
# Documentation
# documentation
%doc %{_defaultdocdir}/%{name}/*
#----------------------
%changelog

View File

@ -1,152 +0,0 @@
#!/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"
}
function download_archive {
echo "Downloading archive:"
(cd $TMPDIR && wget --connect-timeout=10 -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 detect_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
}
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
#-----
#
# 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. 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##*/}"
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
#
if [[ ${ARCHIVE_URL} == http* ]]; then
download_archive
else
copy_archive
fi
#-----------
# Unpack archive
#
detect_archive
unpack_archive
#-----------
# Get the version number
#
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} ${PNAME} || exit_on_error "Failed to create the tarball."
bzip2 ${PNAME}-${VERSION}.tar
echo "Successfully wrote source tarball ${PNAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
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