diff --git a/geekodoc-1.0.2.1.tar.gz b/geekodoc-1.0.2.1.tar.gz deleted file mode 100644 index 052daa5..0000000 --- a/geekodoc-1.0.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:736ea0d1549e7cbc5da2556f352a49f887e58cae883dbf9507000e560ee24bcd -size 335955 diff --git a/geekodoc-2.0.0.tar.bz2 b/geekodoc-2.0.0.tar.bz2 new file mode 100644 index 0000000..9272da5 --- /dev/null +++ b/geekodoc-2.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64e2655bdd7a210dfb72abffff5dee825bee8c5f9f23f5ca2ecb9be56f8bfd15 +size 272795 diff --git a/geekodoc.changes b/geekodoc.changes index e81a234..a33bf81 100644 --- a/geekodoc.changes +++ b/geekodoc.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Fri Sep 3 10:06:03 UTC 2021 - Thomas Schraitle - 2.0.0 + +- Release 2.0.0, no substantial changes + +------------------------------------------------------------------- +Fri Aug 6 07:26:21 UTC 2021 - Thomas Schraitle - 2.0.0.beta4 + +- Prepare 2.0.0 beta4 + - Introduce external directory in source dir + - Update ChangeLog + - Add test cases for both GeekoDoc versions + - Catalog changes + Remove old non-flat URIs as this was not really needed + Keep URIs with flat + - Introduce new directory structure under /usr/share/xml/geekodoc/rng/ + - Add new catalog URIs: + - urn:x-suse:rnc:v1:geekodoc-flat + - urn:x-suse:rnc:v2:geekodoc-flat + - urn:x-suse:rng:v1:geekodoc-flat + - urn:x-suse:rng:v2:geekodoc-flat + - The old URIs are still available: + - https://github.com/openSUSE/geekodoc/raw/master/geekodoc/rng/v1/geekodoc5-flat.rng + - https://github.com/openSUSE/geekodoc/raw/master/geekodoc/rng/v1/geekodoc5-flat.rnc + - urn:x-suse:rng:geekodoc5-flat.rng + +- GeekoDoc v2: + - Base it on DocBook 5.2b10a5 (dbitsxi) + - Identify GeekoDoc as "5.2-subset GeekoDoc-2" + - Incorporate all the changes from GeekoDoc v1 + - Fix #73: Restrict xml:id/linkend to alphanum + "-" (#75) + - Release GeekoDoc 2.0.0 (#76) + - Use dbits.rnc as a basis, instead of docbookxi.rnc for GeekoDoc v1. + This is needed for translation purposes. + +- GeekoDoc v1: + - Describe installation on Debian/Ubuntu (#85) + - Fix #69: reduce content model of replaceable (#71) + - Fix #64: disallow empty sections (#72) + - Fix #59: Reduce content model of command (#66) + - Fix #63: restrict content model of book + - Fix #61: remove depth attribute on imagedata + +------------------------------------------------------------------- +Tue Oct 14 13:42:00 UTC 2020 - Thomas Schraitle - 2.0.0.beta1 + +- Prepare 2.0.0 beta1 (WIP) +- Base GeekoDoc v2 on dbits +- From version 2, only the flat file is packaged as the normal one + is not really used. +- See ChangeLog for further details + ------------------------------------------------------------------- Fri Feb 9 12:27:58 UTC 2018 - thomas.schraitle@suse.com diff --git a/geekodoc.spec b/geekodoc.spec index 880bfdf..4faa071 100644 --- a/geekodoc.spec +++ b/geekodoc.spec @@ -1,7 +1,7 @@ # # spec file for package geekodoc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,28 +12,40 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_without tests - # Name: geekodoc -Version: 1.0.2.1 +Version: 2.0.0 Release: 0 Summary: DocBook based RNG Schema for SUSE Documentation -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Publishing/DocBook -Url: https://github.com/openSUSE/geekodoc/archive/%{name}-%{version}.tar.gz -Source: %{name}-%{version}.tar.gz +URL: https://github.com/openSUSE/geekodoc/archive/%{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 +# Taken from maintenance/novdoc-2019-02-01 +# Created with: +# $ git archive --prefix=novdoc-20190201/ \ +# --output=/tmp/novdoc-20190201.tar.bz2 \ +# --format=tar HEAD novdoc/ catalog.d/ +Source10: novdoc-20190201.tar.bz2 BuildRequires: docbook_5 >= 5.1 +BuildRequires: fdupes BuildRequires: jing BuildRequires: libxml2-tools BuildRequires: make +%if 0%{?is_opensuse} +BuildRequires: openSUSE-release +%else +BuildRequires: sles-release +%endif BuildRequires: python3-rnginline BuildRequires: python3-setuptools BuildRequires: trang + Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 Requires(postun): sgml-skel >= 0.7 @@ -55,33 +67,60 @@ NovDoc is a DTD/RELAX NG schema used for older SUSE documentation. %prep %setup -q +tar -xf %{SOURCE10} +mv novdoc-20190201/novdoc . +mv novdoc-20190201/catalog.d/novdoc.xml catalog.d/ %build touch geekodoc/rng/geekodoc5.rnc # GeekoDoc -make %{?_smp_mflags} VERBOSE=1 -C geekodoc/rng -make %{?_smp_mflags} VERBOSE=1 -C geekodoc/rng geekodoc5-flat.rng +./build.sh -vv # Novdoc -make %{?_smp_mflags} VERBOSE=1 -C novdoc/rng +%make_build -C novdoc/rng %install -install -d %{buildroot}%{_datadir}/xml/{geekodoc/rng,novdoc/rng} \ +docbookxi_rnc="$(xmlcatalog /etc/xml/catalog http://www.docbook.org/xml/5.1/rng/docbookxi.rnc)" +docbookxi_rng="$(xmlcatalog /etc/xml/catalog http://www.docbook.org/xml/5.1/rng/docbookxi.rng)" + +install -d %{buildroot}%{_datadir}/xml/{geekodoc/rng/{1_5.1,2_5.2},novdoc/rng} \ %{buildroot}%{_sysconfdir}/xml/catalog.d -# Install GeekoDoc: -cp geekodoc/rng/geekodoc5-flat.rn? %{buildroot}%{_datadir}/xml/geekodoc/rng +# Fix include for "lonely" schema: +sed -i "s#include \"docbookxi.rnc\"#include \"$docbookxi_rnc\"#" \ + build/geekodoc/rng/1_5.1/geekodoc-v1.rnc +sed -i "s###" \ + build/geekodoc/rng/1_5.1/geekodoc-v1.rng -# Install Novdoc: +#### Install flat GeekoDoc: +install -v -m 0644 build/geekodoc/rng/1_5.1/geekodoc-v1-flat.rn[cg] \ + %{buildroot}%{_datadir}/xml/geekodoc/rng/1_5.1/ +install -v -m 0644 build/geekodoc/rng/2_5.2/geekodoc-v2-flat.rn[cg] \ + %{buildroot}%{_datadir}/xml/geekodoc/rng/2_5.2/ + +pushd %{buildroot}%{_datadir}/xml/geekodoc/rng +# For compatibility reasons: +ln -s 1_5.1/geekodoc-v1-flat.rnc geekodoc5-flat.rnc +ln -s 1_5.1/geekodoc-v1-flat.rng geekodoc5-flat.rng + pushd 1_5.1/ + ln -s geekodoc-v1-flat.rnc geekodoc5-flat.rnc + ln -s geekodoc-v1-flat.rng geekodoc5-flat.rng + popd +popd + +#### Install Novdoc: cp -a novdoc/dtd %{buildroot}%{_datadir}/xml/novdoc cp novdoc/rng/novdocxi-flat.rn? novdoc/rng/novell.ent %{buildroot}%{_datadir}/xml/novdoc/rng -# Install catalogs: +#### Install catalogs: cp catalog.d/* %{buildroot}%{_sysconfdir}/xml/catalog.d/ # Fixup catalog paths sed -i 's#"\.\./#"%{_datadir}/xml/#' %{buildroot}%{_sysconfdir}/xml/catalog.d/* +# Deal with duplicates +%fdupes %{buildroot}%{_datadir}/xml/ + %post update-xml-catalog @@ -105,21 +144,35 @@ update-xml-catalog %if 0%{with tests} %check -cd geekodoc/tests -./run-tests.sh -V xmllint -./run-tests.sh -V jing +./tests/run-tests.sh -V xmllint +./tests/run-tests.sh -V jing + +echo "### Checking catalog entries..." +for uri in \ + urn:x-suse:rnc:v1:geekodoc-flat \ + urn:x-suse:rng:v1:geekodoc-flat \ + urn:x-suse:rnc:v2:geekodoc-flat \ + urn:x-suse:rng:v2:geekodoc-flat \ + urn:x-suse:rng:geekodoc5-flat.rng \ + urn:x-suse:rng:geekodoc5-flat.rnc \ + https://github.com/openSUSE/geekodoc/raw/master/geekodoc/rng/geekodoc5-flat.rnc \ + https://github.com/openSUSE/geekodoc/raw/master/geekodoc/rng/geekodoc5-flat.rng \ + ; + do + xmlcatalog %{buildroot}%{_sysconfdir}/xml/catalog.d/geekodoc.xml $uri || exit $? +done %endif %files %license LICENSE ChangeLog -%config %{_sysconfdir}/xml/catalog.d/geekodoc.xml -%{_datadir}/xml/geekodoc +%config %{_sysconfdir}/xml/catalog.d/geekodoc*.xml +%dir %{_datadir}/xml/geekodoc %{_datadir}/xml/geekodoc/* %files -n novdoc %license LICENSE %config %{_sysconfdir}/xml/catalog.d/novdoc.xml -%{_datadir}/xml/novdoc +%dir %{_datadir}/xml/novdoc %{_datadir}/xml/novdoc/* %changelog diff --git a/novdoc-20190201.tar.bz2 b/novdoc-20190201.tar.bz2 new file mode 100644 index 0000000..7988d98 --- /dev/null +++ b/novdoc-20190201.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89e8cfbbbe9c8088948c4ce81d2957082404c4bbf8758fab3e005f129d80ece1 +size 102400