From 3499ea220ea6368528aa00d193de9caf07fd8165fac0d00a2a85a8bdf470b1b5 Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Wed, 7 Feb 2018 12:12:54 +0000 Subject: [PATCH 1/4] Accepting request 573634 from home:thomas-schraitle:branches:Documentation:Tools - Release 1.0.2 https://github.com/openSUSE/geekodoc/releases/tag/v1.0.2 Only a package release without any changes in the schemas. Fixes issue #41 to reduce number of files in packages - Remove number of files in package; fixes openSUSE/geekodoc#41 some files are only useful for development OBS-URL: https://build.opensuse.org/request/show/573634 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/geekodoc?expand=0&rev=20 --- geekodoc-1.0.1.tar.gz | 3 --- geekodoc-1.0.2.tar.gz | 3 +++ geekodoc.changes | 17 +++++++++++++++++ geekodoc.spec | 18 +++++++++++++----- 4 files changed, 33 insertions(+), 8 deletions(-) delete mode 100644 geekodoc-1.0.1.tar.gz create mode 100644 geekodoc-1.0.2.tar.gz diff --git a/geekodoc-1.0.1.tar.gz b/geekodoc-1.0.1.tar.gz deleted file mode 100644 index 55545cf..0000000 --- a/geekodoc-1.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d2de458ac6170e37a19cf5f7140d8bb3279386e23ce3bceef100a2e6a1e5008 -size 333721 diff --git a/geekodoc-1.0.2.tar.gz b/geekodoc-1.0.2.tar.gz new file mode 100644 index 0000000..f59256d --- /dev/null +++ b/geekodoc-1.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68dfc0a2ea4070b2c20b4bc24c5b225a2cadc6dee9d3993e2be201d5929e3ec2 +size 335167 diff --git a/geekodoc.changes b/geekodoc.changes index 1e44d00..9a5e385 100644 --- a/geekodoc.changes +++ b/geekodoc.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Feb 6 14:49:06 UTC 2018 - thomas.schraitle@suse.com + +- Release 1.0.2 +https://github.com/openSUSE/geekodoc/releases/tag/v1.0.2 + +Only a package release without any changes in the schemas. +Fixes issue #41 to reduce number of files in packages + + +------------------------------------------------------------------- +Tue Feb 6 14:31:32 UTC 2018 - thomas.schraitle@suse.com + +- Remove number of files in package; fixes openSUSE/geekodoc#41 + some files are only useful for development + + ------------------------------------------------------------------- Tue Jan 30 07:23:22 UTC 2018 - thomas.schraitle@suse.com diff --git a/geekodoc.spec b/geekodoc.spec index f345a64..8c7a82e 100644 --- a/geekodoc.spec +++ b/geekodoc.spec @@ -17,7 +17,7 @@ Name: geekodoc -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: DocBook based RNG Schema for SUSE Documentation License: GPL-3.0 @@ -56,14 +56,23 @@ NovDoc is a DTD/RELAX NG schema used for older SUSE documentation. 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 geekodoc5.rng +make %{?_smp_mflags} VERBOSE=1 -C geekodoc/rng geekodoc5-flat.rng # Novdoc make %{?_smp_mflags} VERBOSE=1 -C novdoc/rng %install -install -d %{buildroot}%{_datadir}/xml %{buildroot}%{_sysconfdir}/xml/catalog.d -cp -R geekodoc novdoc %{buildroot}%{_datadir}/xml/ +install -d %{buildroot}%{_datadir}/xml/{geekodoc/rng,novdoc/rng} \ + %{buildroot}%{_sysconfdir}/xml/catalog.d + +# Install GeekoDoc: +cp geekodoc/rng/geekodoc5-flat.rn? %{buildroot}%{_datadir}/xml/geekodoc/rng + +# 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: cp catalog.d/* %{buildroot}%{_sysconfdir}/xml/catalog.d/ # Fixup catalog paths @@ -95,7 +104,6 @@ update-xml-catalog %config %{_sysconfdir}/xml/catalog.d/geekodoc.xml %{_datadir}/xml/geekodoc %{_datadir}/xml/geekodoc/* -%exclude %{_datadir}/xml/geekodoc/tests/* %files -n novdoc %license LICENSE From 14fdfb9c9aebdd31bf1cb8bbd22ffb4fea2827b351b325bf51206e03319beafc Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Wed, 7 Feb 2018 12:58:28 +0000 Subject: [PATCH 2/4] Accepting request 573700 from home:thomas-schraitle:branches:Documentation:Tools - Add bcond_with tests to activate test suite OBS-URL: https://build.opensuse.org/request/show/573700 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/geekodoc?expand=0&rev=21 --- geekodoc.changes | 5 +++++ geekodoc.spec | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/geekodoc.changes b/geekodoc.changes index 9a5e385..ab2ed33 100644 --- a/geekodoc.changes +++ b/geekodoc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 7 12:15:55 UTC 2018 - thomas.schraitle@suse.com + +- Add bcond_with tests to activate test suite + ------------------------------------------------------------------- Tue Feb 6 14:49:06 UTC 2018 - thomas.schraitle@suse.com diff --git a/geekodoc.spec b/geekodoc.spec index 8c7a82e..80dfec3 100644 --- a/geekodoc.spec +++ b/geekodoc.spec @@ -16,6 +16,8 @@ # +%bcond_with tests +# Name: geekodoc Version: 1.0.2 Release: 0 @@ -29,6 +31,10 @@ BuildRequires: make BuildRequires: python3-rnginline BuildRequires: python3-setuptools BuildRequires: trang +%if 0%{with tests} +BuildRequires: jing +BuildRequires: libxml2-tools +%endif Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 Requires(postun): sgml-skel >= 0.7 @@ -50,7 +56,9 @@ NovDoc is a DTD/RELAX NG schema used for older SUSE documentation. %prep %setup -q +%if 0%{without tests} [[ -d geekodoc/tests ]] && rm -rf geekodoc/tests +%endif %build touch geekodoc/rng/geekodoc5.rnc @@ -76,7 +84,7 @@ cp novdoc/rng/novdocxi-flat.rn? novdoc/rng/novell.ent %{buildroot}%{_datadir}/xm cp catalog.d/* %{buildroot}%{_sysconfdir}/xml/catalog.d/ # Fixup catalog paths -sed -i'' 's#"\.\./#"%{_datadir}/xml/#' %{buildroot}%{_sysconfdir}/xml/catalog.d/* +sed -i 's#"\.\./#"%{_datadir}/xml/#' %{buildroot}%{_sysconfdir}/xml/catalog.d/* %post update-xml-catalog @@ -99,6 +107,13 @@ exit 0 %postun -n novdoc update-xml-catalog +%if 0%{with tests} +%check +cd geekodoc/tests +./run-tests.sh -V xmllint +./run-tests.sh -V jing +%endif + %files %license LICENSE %config %{_sysconfdir}/xml/catalog.d/geekodoc.xml From 46535242e854a4b8d8ed1c7b256f5ddc78495bbac433c0451a3ad797fe2a66ee Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 9 Feb 2018 09:09:02 +0000 Subject: [PATCH 3/4] * Build requires jing and libxml2-tools * Don't remove test directory OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/geekodoc?expand=0&rev=22 --- geekodoc.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/geekodoc.spec b/geekodoc.spec index 80dfec3..7f58788 100644 --- a/geekodoc.spec +++ b/geekodoc.spec @@ -16,7 +16,8 @@ # -%bcond_with tests +%bcond_without tests + # Name: geekodoc Version: 1.0.2 @@ -27,14 +28,12 @@ Group: Productivity/Publishing/DocBook Url: https://github.com/openSUSE/geekodoc/archive/%{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz BuildRequires: docbook_5 >= 5.1 +BuildRequires: jing +BuildRequires: libxml2-tools BuildRequires: make BuildRequires: python3-rnginline BuildRequires: python3-setuptools BuildRequires: trang -%if 0%{with tests} -BuildRequires: jing -BuildRequires: libxml2-tools -%endif Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 Requires(postun): sgml-skel >= 0.7 @@ -56,9 +55,6 @@ NovDoc is a DTD/RELAX NG schema used for older SUSE documentation. %prep %setup -q -%if 0%{without tests} -[[ -d geekodoc/tests ]] && rm -rf geekodoc/tests -%endif %build touch geekodoc/rng/geekodoc5.rnc From ab679aa4ba14c746640d0cc9e317505d9a18c7247ba6a241a6c9d44b835344ff Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 9 Feb 2018 12:31:31 +0000 Subject: [PATCH 4/4] - Bugfix release 1.0.2.1 https://github.com/openSUSE/geekodoc/releases/tag/v1.0.2.1 * Correct version in GeekoDoc schema * Add missing 'fig' value (#43) * Improve test suite OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/geekodoc?expand=0&rev=23 --- geekodoc-1.0.2.1.tar.gz | 3 +++ geekodoc-1.0.2.tar.gz | 3 --- geekodoc.changes | 11 +++++++++++ geekodoc.spec | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 geekodoc-1.0.2.1.tar.gz delete mode 100644 geekodoc-1.0.2.tar.gz diff --git a/geekodoc-1.0.2.1.tar.gz b/geekodoc-1.0.2.1.tar.gz new file mode 100644 index 0000000..052daa5 --- /dev/null +++ b/geekodoc-1.0.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:736ea0d1549e7cbc5da2556f352a49f887e58cae883dbf9507000e560ee24bcd +size 335955 diff --git a/geekodoc-1.0.2.tar.gz b/geekodoc-1.0.2.tar.gz deleted file mode 100644 index f59256d..0000000 --- a/geekodoc-1.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68dfc0a2ea4070b2c20b4bc24c5b225a2cadc6dee9d3993e2be201d5929e3ec2 -size 335167 diff --git a/geekodoc.changes b/geekodoc.changes index ab2ed33..e81a234 100644 --- a/geekodoc.changes +++ b/geekodoc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Feb 9 12:27:58 UTC 2018 - thomas.schraitle@suse.com + +- Bugfix release 1.0.2.1 +https://github.com/openSUSE/geekodoc/releases/tag/v1.0.2.1 + +* Correct version in GeekoDoc schema +* Add missing 'fig' value (#43) +* Improve test suite + + ------------------------------------------------------------------- Wed Feb 7 12:15:55 UTC 2018 - thomas.schraitle@suse.com diff --git a/geekodoc.spec b/geekodoc.spec index 7f58788..880bfdf 100644 --- a/geekodoc.spec +++ b/geekodoc.spec @@ -20,7 +20,7 @@ # Name: geekodoc -Version: 1.0.2 +Version: 1.0.2.1 Release: 0 Summary: DocBook based RNG Schema for SUSE Documentation License: GPL-3.0 @@ -111,7 +111,7 @@ cd geekodoc/tests %endif %files -%license LICENSE +%license LICENSE ChangeLog %config %{_sysconfdir}/xml/catalog.d/geekodoc.xml %{_datadir}/xml/geekodoc %{_datadir}/xml/geekodoc/*