From b7928516e5bd747eb655656c811244f490134f27e6dad994b2e4a00d4f1634a8 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Wed, 16 Jan 2013 07:47:59 +0000 Subject: [PATCH] * 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