From a8470ee4b9e5a6e76a6044502a22ab89fbc708e7dc0ae7ab0da4e7a42ede0c6b Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 17 Dec 2012 10:22:28 +0000 Subject: [PATCH] - drop excalibur-avalon from dependencies, fop now uses avalon-framework OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=28 --- xmlgraphics-fop.changes | 5 +++++ xmlgraphics-fop.spec | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index 8b127e0..bbdd460 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 17 10:21:55 UTC 2012 - mvyskocil@suse.com + +- drop excalibur-avalon from dependencies, fop now uses avalon-framework + ------------------------------------------------------------------- Sun Dec 9 08:29:33 UTC 2012 - slavb18@gmail.com diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index f849456..b458df0 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -46,10 +46,9 @@ Patch2: xmlgraphics-fop-xconf.patch Url: http://xmlgraphics.apache.org/fop/ Requires(post): jpackage-utils >= 1.7.4 Requires(postun): jpackage-utils >= 1.7.4 +Requires: avalon-framework Requires: commons-io >= 2.4 Requires: commons-logging -Requires: excalibur-avalon-framework-api -Requires: excalibur-avalon-framework-impl Requires: java >= 1.6.0 Requires: jpackage-utils >= 1.7.4 Requires: xmlgraphics-batik @@ -57,9 +56,8 @@ Requires: xmlgraphics-commons >= 1.5 BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit BuildRequires: ant-trax +BuildRequires: avalon-framework BuildRequires: docbook-xsl-stylesheets -BuildRequires: excalibur-avalon-framework-api -BuildRequires: excalibur-avalon-framework-impl BuildRequires: gpg2 BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc @@ -110,8 +108,7 @@ done %build pushd lib -ln -s $(build-classpath excalibur/avalon-framework-api) -ln -s $(build-classpath excalibur/avalon-framework-impl) +ln -s $(build-classpath avalon-framework) ln -s $(build-classpath commons-io) ln -s $(build-classpath commons-logging) ln -s $(build-classpath servlet_api)