Accepting request 643222 from home:rsalevsky:branches:Documentation:Tools

Stable release DAPS 3.0.0 OBS-URL: https://build.opensuse.org/request/show/643222 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=203
2018-10-19 15:15:44 +00:00
parent cb2d83b106
commit fadf49f49d
4 changed files with 54 additions and 37 deletions
--- a/daps-2.4.0.tar.bz2
+++ b/daps-2.4.0.tar.bz2
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d0f5e3434fa832e28e44c7afbb4b6755f963cf9870865e97b38df5bd4f9e4e3
-size 2368834
--- a/daps-3.0.0.tar.bz2
+++ b/daps-3.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4cb178ca20fe1865f6b9bc7707edad3175d33b9dcc6481feabf04bda503b162d
+size 2245473
--- a/daps.changes
+++ b/daps.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Oct 19 14:02:11 UTC 2018 - rick.salevsky@suse.com
+
+Stable release DAPS 3.0.0:
+
+* New Features:
+  - added full support for Python3
+	- added SVG support for online-docs
+	- added support to build AsciiDoc documentation
+	- integrated hunspell and make aspell optional
+	- implement file not found for XIncludes
+
+* Bugfixes:
+  - #419: HTML and PDF builds need different paths for Admonition
+	  and Callout Images
+	- #322: Add --xmlonly / --imgonly switches to list-srcfiles
+	- #416: DAPS Won't Built With UTF-8 Characters in XML Filenames
+	- #397: Spaces in path problem
+	- #469: RPMLINT complains about permissions of XSLT stylesheet
+	- #464: xmlformat incorrectly formats variablelist terms
+	- #466: Build issues
+	- #475: Tab completion creates error
+	- PDF fails when static links in build/.tmp already exist
+
+* Documentation:
+	- Various updates to reflect changes in the code
+	- Improve help text for daps-xslt
+
 -------------------------------------------------------------------
 Tue Jun 20 13:51:14 UTC 2017 - fsundermeyer@opensuse.org

--- a/daps.spec
+++ b/daps.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package daps
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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:           daps
-Version:        2.4.0
+Version:        3.0.0
 Release:        0

 ###############################################################
@@ -65,9 +65,8 @@ BuildRequires:  libxml2-tools
 BuildRequires:  libxslt
 BuildRequires:  libxslt-tools
 BuildRequires:  poppler-tools
-BuildRequires:  python-lxml
+BuildRequires:  python3-lxml
 BuildRequires:  python-xml
-#BuildRequires:  sgml-skel
 BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  svg-dtd
 BuildRequires:  transfig
@@ -94,13 +93,15 @@ Requires:       docbook_4
 Requires:       docbook_5
 Requires:       ghostscript-library
 Requires:       inkscape
+Requires:       java >= 1.8.0
 Requires:       jing
+Requires:       libreoffice-draw
 Requires:       libxslt
 Requires:       make
 Requires:       poppler-tools
-Requires:       python-lxml
+Requires:       python3-lxml
 Requires:       python-xml
-#Requires:       sgml-skel
+Requires:       rubygem(%{rb_default_ruby_abi}:asciidoctor)
 Requires:       suse-xsl-stylesheets
 Requires:       svg-schema
 Requires:       transfig
@@ -118,10 +119,12 @@ Recommends:     optipng
 Recommends:     perl-checkbot
 Recommends:     remake
 Recommends:     suse-doc-style-checker
+Recommends:     suse-documentation-dicts-en
 Recommends:     w3m
+Recommends:     xmlformat
+
 # Internal XEP package:
 Recommends:     xep
-Recommends:     xmlformat

 Obsoletes:      susedoc < 4.3.32
 Provides:       susedoc = 4.3.32
@@ -148,6 +151,10 @@ for upgrade instructions.
 %setup -q -n %{name}
 #%%patch1 -p1

+# Correct shebang line as suggested in
+# https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html
+sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed
+
 #--------------------------------------------------------------------------
 %build
 %configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog
@@ -162,35 +169,12 @@ make install DESTDIR=$RPM_BUILD_ROOT

 #----------------------
 %post
-#
-# XML Catalog entries for daps profiling
-#
-# remove existing entries first (if existing) - needed for
-# zypper in, since it does not call postun
-#
-# delete in case of an update, which $1=2
-if [ "2" = "$1" ]; then
-  edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
-  --del %{name} || true
-fi
-# ... and readd it again
-edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
-  --add /etc/xml/%{daps_catalog}
-
+update-xml-catalog
 exit 0

 #----------------------
 %postun
-#
-# delete catalog entry for daps profiling
-# only run if package is really uninstalled ($1 = 0) and not
-# in case of an update
-#
-if [ 0 = $1 ]; then
-  edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
-  --del %{name}
-fi
-
+update-xml-catalog
 exit 0

 #----------------------
@@ -200,6 +184,7 @@ exit 0
 %files
 %defattr(-,root,root)

+%dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_defaultdocdir}/%{name}

@@ -209,14 +194,18 @@ exit 0
 %dir %{_datadir}/xml/%{name}
 %dir %{_datadir}/xml/%{name}/schema

-%config %{_sysconfdir}/xml/*.xml
+# Catalogs
+%config %{_sysconfdir}/xml/catalog.d/%{name}.xml
+
+# Config files
 %config %{_sysconfdir}/%{name}/*

+# Man/Doc
 %doc %{_mandir}/man1/*.1%{ext_man}
 %doc %{_defaultdocdir}/%{name}/*

 %{_bindir}/*
-%{_datadir}/%{name}/*
+%attr(644, root, root) %{_datadir}/%{name}/libexec/*.xsl
 %{_datadir}/bash-completion/completions/%{name}
 %{_datadir}/emacs/site-lisp/docbook_macros.el
 %{_datadir}/xml/daps/schema/*