From ce3bcb4a7348eb8b9baf1ca37be822b381781d45 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 10 Jun 2011 14:09:08 +0300 Subject: [PATCH] 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(-) delete mode 100644 build.xml.tar.gz delete mode 100644 qdox-settings.xml diff --git a/build.xml.tar.gz b/build.xml.tar.gz deleted file mode 100644 index 1e11c69a9d1a128633fb8eb3afff707da0304690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2585 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 vQX8-SKZaUpp@kM&XrYA`T4fs|A diff --git a/qdox-settings.xml b/qdox-settings.xml deleted file mode 100644 index efe7bd7..0000000 --- a/qdox-settings.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - JPP - - - internal - jpp - __JPP_URL_PLACEHOLDER__ - - - external - jpp - __JAVADIR_PLACEHOLDER__ - - - local - jpp - __MAVENREPO_DIR_PLACEHOLDER__ - - - - - plugins-internal - plugins-internal - jpp - __JPP_URL_PLACEHOLDER__ - - - plugins-external - plugins-external - jpp - __JAVADIR_PLACEHOLDER__ - - - plugins-maven - plugins-maven - jpp - __MAVENDIR_PLUGIN_PLACEHOLDER__ - - - - - - JPP - - 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 0:1.12-3 +- Build with maven 3.x. +- Adapt to current guidelines. + * Tue Feb 08 2011 Fedora Release Engineering - 0:1.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild