From a8996cf40de6c71aeb27e1ad9afd3cbd56fb1f2b Mon Sep 17 00:00:00 2001 From: gil Date: Wed, 3 Jul 2013 22:33:57 +0200 Subject: [PATCH] switch to XMvn --- replacer.spec | 59 ++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/replacer.spec b/replacer.spec index c628330..37dfd87 100644 --- a/replacer.spec +++ b/replacer.spec @@ -1,8 +1,7 @@ Name: replacer Version: 1.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Replacer Maven Mojo -Group: Development/Libraries License: MIT URL: http://code.google.com/p/maven-replacer-plugin/ # svn export http://maven-replacer-plugin.googlecode.com/svn/tags/replacer-1.5.2/trunk/ replacer-1.5.2 @@ -11,28 +10,21 @@ Source0: %{name}-%{version}-src-svn.tar.gz # replacer don't include the license file. see: http://code.google.com/p/maven-replacer-plugin/issues/detail?id=84 BuildRequires: java-devel -BuildRequires: ant -BuildRequires: apache-commons-io -BuildRequires: apache-commons-lang +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: xerces-j2 +BuildRequires: mvn(org.sonatype.oss:oss-parent) +BuildRequires: mvn(xerces:xercesImpl) # test deps -BuildRequires: junit -BuildRequires: mockito -BuildRequires: hamcrest12 -# mvn(org.hamcrest:hamcrest-all) = 1.1 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.hamcrest:hamcrest-all) +BuildRequires: mvn(org.mockito:mockito-all) BuildRequires: maven-local BuildRequires: maven-plugin-plugin -Requires: ant -Requires: apache-commons-io -Requires: apache-commons-lang -Requires: mvn(org.apache.maven:maven-plugin-api) -Requires: xerces-j2 - -Requires: java BuildArch: noarch %description @@ -42,7 +34,6 @@ This plugin is also used to automatically generating PackageVersion.java in the FasterXML.com project. %package javadoc -Group: Documentation Summary: Javadoc for %{name} %description javadoc @@ -53,32 +44,24 @@ This package contains javadoc for %{name}. %pom_remove_plugin :dashboard-maven-plugin +%mvn_file :%{name} %{name} +%mvn_alias :%{name} com.google.code.maven-replacer-plugin:maven-replacer-plugin + %build -# required hamcrest 1.1 and 1.3 isnt available in F18 -mvn-rpmbuild \ - -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/hamcrest12" \ - package javadoc:aggregate + +%mvn_build %install +%mvn_install -mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +%files -f .mfiles -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap -a "com.google.code.maven-replacer-plugin:maven-replacer-plugin" - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Wed Jul 03 2013 gil cattaneo 1.5.2-2 +- switch to XMvn +- minor changes to adapt to current guideline + * Sun May 26 2013 gil cattaneo 1.5.2-1 - initial rpm \ No newline at end of file