commit 3fcd896c76fab1db6e4f7141645c32d350121e36
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Sep 7 21:06:32 2011 +0300
Drop ant build.
- Further cleanups.
plexus-velocity.spec | 58 ++++++++++---------------------------------------
1 files changed, 12 insertions(+), 46 deletions(-)
---
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index 158fb6a..0c715b3 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -28,19 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 1
-%define without_maven 0
-
-%define section free
%define parent plexus
%define subname velocity
Name: plexus-velocity
Version: 1.1.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: Plexus Velocity Component
License: ASL 2.0
@@ -49,32 +42,28 @@ URL:
http://plexus.codehaus.org/
# svn export
http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.8/
# tar czf plexus-velocity-1.1.8-src.tar.gz plexus-velocity-1.1.8/
Source0: plexus-velocity-%{version}-src.tar.gz
-Source1: plexus-velocity-1.1.7-build.xml
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
-BuildRequires: java-devel >= 1.6.0
-%if %{with_maven}
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
-%endif
BuildRequires: ant-contrib
-BuildRequires: ant-nodeps
BuildRequires: classworlds >= 0:1.1
-BuildRequires: jakarta-commons-collections
+BuildRequires: apache-commons-collections
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: velocity
Requires: classworlds >= 0:1.1
-Requires: jakarta-commons-collections
+Requires: apache-commons-collections
Requires: plexus-container-default
Requires: plexus-utils
Requires: velocity
@@ -89,7 +78,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
%description javadoc
Javadoc for %{name}.
@@ -99,36 +88,13 @@ Javadoc for %{name}.
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
-cp %{SOURCE1} build.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
-%if %{with_maven}
# Use normal pom for now
rm -f release-pom.xml
mvn-rpmbuild \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:aggregate
-%else
-
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-commons-collections \
-commons-logging-api \
-plexus/container-default \
-plexus/utils \
-velocity \
-
-ant jar javadoc
-
-%endif
%install
# jars
@@ -136,26 +102,26 @@ install -Dpm 644 target/%{name}-%{version}.jar \
%{buildroot}/%{_javadir}/%{parent}/%{subname}.jar
# poms
-%if %{with_maven}
install -Dpm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
-%endif
# javadoc
install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
%files
-%{_javadir}/%{parent}
-%{_mavendepmapfragdir}
-%if %{with_maven}
+%{_javadir}/%{parent}/*
+%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*
-%endif
%files javadoc
%doc %{_javadocdir}/*
%changelog
+* Wed Sep 7 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1.8-8
+- Drop ant build.
+- Further cleanups.
+
* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.1.8-7
- Migration to maven3
- Removal of plexus-maven-plugin (not needed)