From 62356368b7927080febe6eca44c1bbee04a32f0e Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mar 30 2011 08:38:13 +0000
Subject: Build with maven 3 and drop ant buil.xml files.


---

diff --git a/felix-osgi-core.spec b/felix-osgi-core.spec
index 23ee485..129bdb1 100644
--- a/felix-osgi-core.spec
+++ b/felix-osgi-core.spec
@@ -2,19 +2,19 @@
 
 Name:    felix-osgi-core
 Version: 1.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Felix OSGi R4 Core Bundle
 
 Group:   Development/Libraries
 License: ASL 2.0
 URL:     http://felix.apache.org/site/apache-felix-osgi-core.html
 Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
-Source1: %{name}-%{version}-build.xml.tar.gz
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: ant
+BuildRequires: felix-parent
+BuildRequires: maven-surefire-provider-junit4
 BuildRequires: jpackage-utils
 
 Requires: java >= 1:1.6.0
@@ -36,14 +36,9 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{bundle}-%{version}
 
-tar xf %{SOURCE1}
-
-%__mkdir_p .m2/repository
 
 %build
-%ant -Dmaven.settings.offline=true \
-     -Dmaven.repo.local=.m2/repository \
-     package javadoc
+mvn-rpmbuild package javadoc:aggregate
 
 %install
 # jars
@@ -81,6 +76,9 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.4.0-7
+- Build with maven 3 and drop ant buil.xml files.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 35f7243..f80f887 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 309a1c3be449ecc280c078e2d9cde920  org.osgi.core-1.4.0-project.tar.gz
-b3f2cf0254e31eb85fc63e5b0acb4677  felix-osgi-core-1.4.0-build.xml.tar.gz