Accepting request 574639 from Documentation:Tools

- 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
- Add bcond_with tests to activate test suite 
- 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/574639
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geekodoc?expand=0&rev=6

geekodoc-1.0.1.tar.gz

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

geekodoc-1.0.2.1.tar.gz

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

geekodoc.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+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
+
+- Add bcond_with tests to activate test suite 
+
+-------------------------------------------------------------------
+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
 

geekodoc.spec

@@ -16,8 +16,11 @@
 #
 
 
+%bcond_without  tests
+
+#
 Name:           geekodoc
-Version:        1.0.1
+Version:        1.0.2.1
 Release:        0
 Summary:        DocBook based RNG Schema for SUSE Documentation
 License:        GPL-3.0
@@ -25,6 +28,8 @@ 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
@@ -50,24 +55,32 @@ NovDoc is a DTD/RELAX NG schema used for older SUSE documentation.
 
 %prep
 %setup -q
-[[ -d geekodoc/tests ]] && rm -rf geekodoc/tests
 
 %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 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
+install -d %{buildroot}%{_datadir}/xml/{geekodoc/rng,novdoc/rng} \
-cp -R geekodoc novdoc %{buildroot}%{_datadir}/xml/
+           %{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
-sed -i'' 's#"\.\./#"%{_datadir}/xml/#' %{buildroot}%{_sysconfdir}/xml/catalog.d/*
+sed -i 's#"\.\./#"%{_datadir}/xml/#' %{buildroot}%{_sysconfdir}/xml/catalog.d/*
 
 %post
 update-xml-catalog
@@ -90,12 +103,18 @@ 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
+%license LICENSE ChangeLog
 %config %{_sysconfdir}/xml/catalog.d/geekodoc.xml
 %{_datadir}/xml/geekodoc
 %{_datadir}/xml/geekodoc/*
-%exclude %{_datadir}/xml/geekodoc/tests/*
 
 %files -n novdoc
 %license LICENSE