From 27db20d9cd615d4f1b4dd4db6308eea0a4ce4ed1f40d1c9edd7c18a1148d2c17 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 25 Jan 2012 10:14:10 +0000 Subject: [PATCH] - use new _mavendepmapfragdir macro instead of hardocded path - change java-devel Requires to Recommends OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=28 --- ant.changes | 6 ++++++ ant.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ant.changes b/ant.changes index a111e7b..ccdf224 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 25 09:54:17 UTC 2012 - mvyskocil@suse.cz + +- use new _mavendepmapfragdir macro instead of hardocded path +- change java-devel Requires to Recommends + ------------------------------------------------------------------- Tue Jan 3 01:01:19 CET 2012 - dmueller@suse.de diff --git a/ant.spec b/ant.spec index b7644a8..e927c42 100644 --- a/ant.spec +++ b/ant.spec @@ -80,7 +80,8 @@ Requires: jaxp_parser_impl Requires: xml-commons-apis Requires: xml-commons-resolver Requires: jpackage-utils >= 1.7.5 -Requires: java-devel >= 1.5.0 +# allow usage third-party java in future +Recommends: java-devel >= 1.5.0 Obsoletes: apache-ant < %{version} Provides: apache-ant = %{version} Obsoletes: ant-nodeps < %{version} @@ -688,7 +689,6 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ %{_datadir}/maven2/poms/JPP-ant-parent.pom %{_datadir}/maven2/poms/JPP-ant.pom %config(noreplace) %{_mavendepmapfragdir}/* -%config(noreplace) %dir %{_sysconfdir}/maven/fragments %dir %{_datadir}/maven2 %dir %{_datadir}/maven2/poms