[qdox] Build with maven 3.x.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jun 10 11:09:35 UTC 2011
commit ce3bcb4a7348eb8b9baf1ca37be822b381781d45
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date: Fri Jun 10 14:09:08 2011 +0300
Build with maven 3.x.
Adapt to current guidelines.
build.xml.tar.gz | Bin 2585 -> 0 bytes
qdox-settings.xml | 47 -----------------------------------------------
qdox.spec | 35 ++++++++++-------------------------
3 files changed, 10 insertions(+), 72 deletions(-)
---
diff --git a/qdox.spec b/qdox.spec
index c50b26d..c72a2cd 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -31,7 +31,7 @@
Summary: Extract class/interface/method definitions from sources
Name: qdox
Version: 1.12
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://qdox.codehaus.org/
@@ -46,7 +46,7 @@ BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit >= 0:3.8.1
BuildRequires: byaccj
BuildRequires: jflex
-BuildRequires: maven2 >= 2.0.7
+BuildRequires: maven
BuildRequires: maven-ant-plugin
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
@@ -71,8 +71,6 @@ Requires(post): jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
Obsoletes: qdox-manual <= 0:1.9.2
@@ -105,23 +103,14 @@ ln -s $(build-classpath jflex) bootstrap
#ln -s $(build-classpath java-cup) bootstrap
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
+mvn-rpmbuild \
-Dmaven.test.skip=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
ant:ant install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
%add_to_maven_depmap com.thoughtworks.qdox qdox %{version} JPP %{name}
@@ -133,12 +122,8 @@ install -m 644 pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -147,19 +132,19 @@ rm -rf $RPM_BUILD_ROOT
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt README.txt
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jun 10 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.12-3
+- Build with maven 3.x.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list