diff --git a/_service b/_service new file mode 100644 index 0000000..3362ef0 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + 3.1.1 + + https://github.com/openSUSE/daps.git + git + 3.1.1 + + + *.tar + bz2 + + + diff --git a/daps-3.0.0.tar.bz2 b/daps-3.0.0.tar.bz2 deleted file mode 100644 index fa74d4e..0000000 --- a/daps-3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0875950b0e55a76c7a505b3019f5301d9f181439769d93b7fc6f774d3d80eeb3 -size 2349899 diff --git a/daps-3.1.1.tar.bz2 b/daps-3.1.1.tar.bz2 new file mode 100644 index 0000000..f9f3ca3 --- /dev/null +++ b/daps-3.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cc04def0124122af08876f5eb34386939aac7121b472251e260421e7449e6bc +size 11837696 diff --git a/daps-fetch-source-git b/daps-fetch-source-git deleted file mode 100644 index 0325d7e..0000000 --- a/daps-fetch-source-git +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash -# -# -# Create DAPS 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=daps -VERSION= -SPECFILE=${NAME}.spec -TMPDIR=$(mktemp -q -d --tmpdir daps_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 DAPS release archive on Github, e.g.\nhttps://github.com/openSUSE/daps/archive/daps-2.0-rc5.tar.gz" -else - ARCHIVE_URL="$1" - ARCHIVE_NAME="${ARCHIVE_URL##*/}" -fi - -# This script needs to be called from the daps osc checkout directory, so -# lets check whether we are in the correct directory -# -if [[ ! -s daps.spec && ! -d .osc ]]; then - echo "Looks like you are not in the daps 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}/${NAME} -EXCLUDES=${SRC_DIR}/packaging/exclude-files_for_daps_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 ${NAME}-${VERSION}.tar -C ${TMPDIR} \ - --exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the tarball." -bzip2 -9 ${NAME}-${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/daps-gnu-make-4.3.patch b/daps-gnu-make-4.3.patch deleted file mode 100644 index 2eb16d9..0000000 --- a/daps-gnu-make-4.3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 81f7829d0b8d115214d46e9093f3c157f9fd046b Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Mon, 30 Mar 2020 17:44:08 +0200 -Subject: [PATCH] Fix creation of $SPACE with GNU Make 4.3 - -GNU Make 4.3 has this incompatible change: - * WARNING: Backward-incompatibility! - Previously appending using '+=' to an empty variable would result in a - value starting with a space -This is eactly what the code relied on to before. - -https://bugzilla.opensuse.org/show_bug.cgi?id=1168051 ---- - make/common_variables.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/make/common_variables.mk b/make/common_variables.mk -index 3eabc3a5..8fe07d16 100644 ---- a/make/common_variables.mk -+++ b/make/common_variables.mk -@@ -46,8 +46,8 @@ endif - # a space is needed, since it is not possible to replace a literal - # space (same goes for comma) - # --SPACE := --SPACE += -+empty := -+SPACE := $(empty) $(empty) - - COMMA := , - - diff --git a/daps.changes b/daps.changes index ffbbd76..1bdff77 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,125 @@ +------------------------------------------------------------------- +Wed May 12 10:12:31 UTC 2021 - Stefan Knorr + +- Stable release DAPS 3.1.1: + +* Bug fixes: + - Removed error messages that appeared during command-line + completion + +* Packaging changes: + - Updated Spec file from OBS repo + +------------------------------------------------------------------- +Tue May 11 13:18:36 UTC 2021 - Stefan Knorr + +- Stable release DAPS 3.1.0: + +* New features: + - Allow converting AsciiDoc books with multiple parts into a + DocBook set (`--adocset`/`ADOC_SET="yes"`) + - Remove `dm:docmanager` during `unpack-lockdrop` when + `--remove-dm` is used + - Added support for DITAA diagrams as an image format (must be + added as an external file) (#540) + - Allow using `{daps-adoc-attribute}` from AsciiDoc sources to + add a list of all AsciiDoc attributes used by DAPS to the + output (#573) + - Added `daps validate` options `--validate-ids` (checks + whether IDs match a basic SEO-compatible set of characters) and + `--validate-images` (checks for missing and duplicated images) + - Renamed `daps checklink` to `daps linkcheck` for consistency + with `daps spellcheck` and `daps stylecheck` + - Renamed `PDFNAME` to `OUTPUTNAME` DC file option to clarify + its purpose + +* Removed features: + - Removed support for the Xfig (`.fig`), PDF, and EPS image + formats + - Removed support for the `asciidoc` tool, DAPS now only supports + AsciiDoctor + - Removed support for `--xsltparam` which has been replaced by + `--stringparam` + - Removed `--css=none` option of `daps epub` + - Removed `daps-auto.pl` which has been replaced by + `daps-autobuild` + - Removed all support for Python 2 dependencies + +* Bug fixes: + - When AsciiDoctor outputs a warning, DAPS will now fail, + avoiding XML issues that would crop up later (this only works + if AsciiDoctor >= 1.5.7 is used) + - Find unresolvable AsciiDoc attribute references (such as + `{reference}`) and error out rather than adding them to the + output + - When converting AsciiDoc, always unset the `imagesdir` + attribute, so DAPS can mandate its own `images` directory + - On successive DAPS runs, always convert AsciiDoc files to XML + again + - Improved default IDs generated by AsciiDoctor, to avoid leading + underscores in IDs (#520) + - Improved AsciiDoc `postprocess.xsl` clean-up stylesheet: + - Rewrite `@contentwidth` to `@width` + - Improved display of article titles + - Fixed validation of generated abstract elements + - Improved workarounds for `authorinitials`, `othername`, + `lineage` + - Output AsciiDoc `<>` construct as + `title ()` (same for links) + - Improved handling of slightly misused AsciiDoc block/ + example syntax that was previously converted to + GeekoDoc-incompatible `formalpara` elements + - Fixed updating of profiled files when an entity or the DC + file of the source has changed + - Only use AsciiDoctor's `--failure-level` if the version of + AsciiDoctor is new enough to support it + - Allowed use of AsciiDoc attributes defined on command line + and in DC file at the same time + - Made DAPS's default set of AsciiDoc attributes overridable + - Internally handle `--param` the same as `--stringparam` (#589) + - Made sure that both `index.html` and `[ROOTID].html` are + generated during HTML builds + - Reworked `getentityname.py` (#556) + - Restored compatibility with Novdoc profiling stylesheet + references + - Avoid stumbling over empty hrefs in XIncludes during validation + - Fixed issue where DC file parser would concatenate rather + than overwrite values + - Fixed issue where DC file parser would not correctly recognize + last line of a DC file if it did not end in a newline character + (#553) + - Fixed issue where default entities like `—` could not + be found + - Fixed `unpack-locdrop` runs that failed because file lists + contained spaces rather than line breaks + - Use `PROFOS` value during `locdrop` + - Fixed `daps html --nostatic` build failure resulting from + identical files error + - Fixed GNU Make 4.3 `+=` operator compatibility + - Added compatibility with Inkscape 1.0 command-line options + - Set initial memory for FOP + - Fixed path to Avalon Framework (bsc#1175214) + - Fixed LibreOffice Draw executable name for Debian (#564) + - Improved error message when MAIN file is missing (#494) + - Improved error message displayed when ROOTID does not exist in + the document (#546) + - Show FOP warnings when running with `-vv` or higher verbosity + - Suppressed error messages about missing `xml:base` during + `daps linkcheck` (#558) + - Improved message output of `daps-xmlwellformed` + - Improved Git updating flow in `daps-autobuild` + +* Documentation: + - Added man pages for `daps-xmlformat` and `daps-check-deps` + (#491) + - Added documentation for generating a DocBook set from an + AsciiDoc book + - Fixed typos and other minor issues throughout the documentation + +* Packaging changes: + - Cleaned up TAR archives generated by GitHub (#489) + - Do not make libexec XSL files executable (#492) + ------------------------------------------------------------------- Thu Apr 2 15:32:20 UTC 2020 - Dominique Leuenberger diff --git a/daps.spec b/daps.spec index ba58b5d..73d518a 100644 --- a/daps.spec +++ b/daps.spec @@ -1,7 +1,7 @@ # # spec file for package daps # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,29 +17,10 @@ Name: daps -Version: 3.0.0 +Version: 3.1.1 Release: 0 -############################################################### -# -# ATTENTION: Do NOT edit this file outside of -# https://github.com/openSUSE/daps/blob/develop/packaging/daps.spec -# -# Your changes will be lost on the next update -# If you do not have access to the GitHub repository, notify -# or -# or send a patch -# -################################################################ -# -# Please submit bugfixes or comments via -# https://github.com/openSUSE/daps/issues -# - %define docbuilddir %{_datadir}/daps -%define regcat %{_bindir}/sgml-register-catalog -%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current -%define daps_catalog for-catalog-%{name}.xml Summary: DocBook Authoring and Publishing Suite License: GPL-2.0-only OR GPL-3.0-only @@ -47,8 +28,6 @@ Group: Productivity/Publishing/XML URL: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc -Source2: %{name}-fetch-source-git -Patch0: daps-gnu-make-4.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +38,7 @@ BuildRequires: bash >= 4 BuildRequires: dia BuildRequires: docbook-xsl-stylesheets >= 1.77 BuildRequires: docbook_4 +BuildRequires: docbook_5 BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: inkscape @@ -67,30 +47,15 @@ BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: libxslt-tools BuildRequires: poppler-tools -BuildRequires: python-xml BuildRequires: python3-lxml BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd -BuildRequires: transfig BuildRequires: xerces-j2 BuildRequires: xml-apis BuildRequires: xmlgraphics-fop >= 0.94 BuildRequires: xmlstarlet - -# Asciidoctor is not available on Leap 42.3 -# If we have asciidoctor we build the asciidoc manual -# for which we need docbook_5 and jing -# -%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} -Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor) -%else -Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) -BuildRequires: docbook_5 -BuildRequires: jing BuildRequires: rubygem(%{rb_default_ruby_abi}:asciidoctor) -%endif -# # In order to keep the requirements list as short as possible, only packages # needed to build EPUB, HTML and PDF are really required # All other packages required for editing or more exotic output formats @@ -113,19 +78,19 @@ Requires: jing Requires: libxslt Requires: make Requires: poppler-tools -Requires: python-xml Requires: python3-lxml Requires: suse-xsl-stylesheets Requires: svg-schema -Requires: transfig Requires: xerces-j2 Requires: xml-apis Requires: xmlgraphics-fop >= 0.94 Requires: xmlstarlet Requires: zip +Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) Recommends: aspell-en Recommends: calibre +Recommends: ditaa Recommends: epubcheck Recommends: exiftool %ifarch aarch64 %{ix86} x86_64 @@ -140,10 +105,7 @@ Recommends: w3m Recommends: xmlformat # Internal XEP package: -Recommends: xep - -Obsoletes: susedoc < 4.3.32 -Provides: susedoc = 4.3.32 +Suggests: xep %description DocBook Authoring and Publishing Suite (DAPS) @@ -154,19 +116,13 @@ single command. It also contains tools to generate profiled source tarballs for distributing your XML sources for translation or review. DAPS also includes tools that assist you when writing DocBook XML: -linkchecker, validator, spellchecker, editor macros and stylesheets for +validator, link checker, spellchecker, editor macros and stylesheets for converting DocBook XML. -DAPS is the successor of susedoc. See -/usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x -for upgrade instructions. - #-------------------------------------------------------------------------- %prep -%setup -q -n %{name} -%patch0 -p1 -#%%patch1 -p1 +%setup -q -n %{name}-%{version} # Correct shebang line as suggested in # https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html @@ -175,7 +131,7 @@ sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed #-------------------------------------------------------------------------- %build %configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} #-------------------------------------------------------------------------- %install