From ddfa59b09657f6498977015d69a9f7dc2914603b47f48d0e04ad7ad6661bf590 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Tue, 15 Jan 2013 16:00:47 +0000 Subject: [PATCH 1/2] Version 1.9.15: * Schema - qandaset are included in a section; that means, no title in qandaset is useful - qandadiv can still contain a title, but it contains only qandaentrys - question must always start with a para; after this para other elements are allowed - qandaentry requires one question and one answer in this order SPEC file: * Used font requirements from daps.spec; see ticket#116 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=47 --- suse-xsl-stylesheets-1.9.14.tar.bz2 | 3 --- suse-xsl-stylesheets-1.9.15.tar.bz2 | 3 +++ suse-xsl-stylesheets.changes | 15 +++++++++++++++ suse-xsl-stylesheets.spec | 8 +------- 4 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 suse-xsl-stylesheets-1.9.14.tar.bz2 create mode 100644 suse-xsl-stylesheets-1.9.15.tar.bz2 diff --git a/suse-xsl-stylesheets-1.9.14.tar.bz2 b/suse-xsl-stylesheets-1.9.14.tar.bz2 deleted file mode 100644 index b7e22e1..0000000 --- a/suse-xsl-stylesheets-1.9.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f9561dc5eedcd1a40c09100cf216a2671e45078dd6aa3a30a4e207352afd2e3 -size 747652 diff --git a/suse-xsl-stylesheets-1.9.15.tar.bz2 b/suse-xsl-stylesheets-1.9.15.tar.bz2 new file mode 100644 index 0000000..98d1cb8 --- /dev/null +++ b/suse-xsl-stylesheets-1.9.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3efc8b3297079b388b0fb00f25611ef0289a611ca963cc441bbe28a0d0cdc429 +size 740865 diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes index a2051ea..92b9f51 100644 --- a/suse-xsl-stylesheets.changes +++ b/suse-xsl-stylesheets.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jan 15 15:41:05 UTC 2013 - toms@opensuse.org + +Version 1.9.15: +* Schema + - qandaset are included in a section; that means, no title in qandaset + is useful + - qandadiv can still contain a title, but it contains only qandaentrys + - question must always start with a para; after this para other + elements are allowed + - qandaentry requires one question and one answer in this order + +SPEC file: +* Used font requirements from daps.spec; see ticket#116 + ------------------------------------------------------------------- Tue Jan 8 08:02:14 UTC 2013 - toms@opensuse.org diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec index ddc2e23..2a17085 100644 --- a/suse-xsl-stylesheets.spec +++ b/suse-xsl-stylesheets.spec @@ -17,7 +17,7 @@ Name: suse-xsl-stylesheets -Version: 1.9.14 +Version: 1.9.15 Release: 0 %define dtdversion 1.0 @@ -37,7 +37,6 @@ Source2: %{name}.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: bzip2 BuildRequires: docbook-xsl-stylesheets >= 1.75 BuildRequires: fdupes BuildRequires: libxslt @@ -48,11 +47,6 @@ Requires: docbook Requires: docbook-xsl-stylesheets >= 1.75 Requires: libxslt -# Only needed to fix the "have choice" error between xerces-j2 and crimson -%if 0%{?suse_version} == 1210 -BuildRequires: xerces-j2 -%endif - Recommends: daps Recommends: docbook5 Recommends: docbook5-xsl-stylesheets From b7928516e5bd747eb655656c811244f490134f27e6dad994b2e4a00d4f1634a8 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Wed, 16 Jan 2013 07:47:59 +0000 Subject: [PATCH 2/2] * Added additional check for 12.1 to avoid the "have choice" error OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=48 --- suse-xsl-stylesheets.changes | 3 ++- suse-xsl-stylesheets.spec | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes index 92b9f51..8b933a9 100644 --- a/suse-xsl-stylesheets.changes +++ b/suse-xsl-stylesheets.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Jan 15 15:41:05 UTC 2013 - toms@opensuse.org +Tue Jan 16 08:45:00 UTC 2013 - toms@opensuse.org Version 1.9.15: * Schema @@ -12,6 +12,7 @@ Version 1.9.15: SPEC file: * Used font requirements from daps.spec; see ticket#116 +* Added additional check for 12.1 to avoid the "have choice" error ------------------------------------------------------------------- Tue Jan 8 08:02:14 UTC 2013 - toms@opensuse.org diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec index 2a17085..b501b3a 100644 --- a/suse-xsl-stylesheets.spec +++ b/suse-xsl-stylesheets.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: suse-xsl-stylesheets Version: 1.9.15 Release: 0 @@ -43,6 +42,11 @@ BuildRequires: libxslt BuildRequires: make BuildRequires: trang +# Only needed to fix the "have choice" error between xerces-j2 and crimson +%if 0%{?suse_version} == 1210 +BuildRequires: xerces-j2 +%endif + Requires: docbook Requires: docbook-xsl-stylesheets >= 1.75 Requires: libxslt