commit 638cfe93fa89eddbe19c86a1380481bbac92f5b1 Author: gil puntogil@libero.it Date: Sat Jul 6 00:08:31 2013 +0200
switch to XMvn
native2ascii-maven-plugin.spec | 53 +++++++++++---------------------------- 1 files changed, 15 insertions(+), 38 deletions(-) --- diff --git a/native2ascii-maven-plugin.spec b/native2ascii-maven-plugin.spec index 1556074..eb9c505 100644 --- a/native2ascii-maven-plugin.spec +++ b/native2ascii-maven-plugin.spec @@ -2,42 +2,30 @@ %global namedversion %{version}%{?namedreltag} Name: native2ascii-maven-plugin Version: 1.0 -Release: 0.5.beta1%{?dist} +Release: 0.6.beta1%{?dist} Summary: Native2Ascii Maven Plugin -Group: Development/Libraries License: MIT URL: http://mojo.codehaus.org/%%7Bname%7D/ Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/%%7Bname%7D/%%7Bnamedversion... BuildRequires: java-devel -BuildRequires: jpackage-utils -BuildRequires: mojo-parent + +BuildRequires: mvn(org.codehaus.mojo:mojo-parent) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: junit + BuildRequires: maven-local -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin BuildRequires: maven-invoker-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-cobertura BuildRequires: maven-plugin-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-project - # requires by javadoc-plugin BuildRequires: mvn(org.apache.maven.shared:maven-invoker) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
-Requires: maven -Requires: maven-project -Requires: mojo-parent - -Requires: java -Requires: jpackage-utils BuildArch: noarch
%description @@ -46,9 +34,7 @@ supported character encoding to one with ASCII and/or Unicode escapes.
%package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc This package contains javadoc for %{name}. @@ -59,32 +45,23 @@ This package contains javadoc for %{name}.
%build
-mvn-rpmbuild install javadoc:aggregate +%mvn_file :%{name} %{name} +%mvn_build
%install +%mvn_install
-mkdir -p %{buildroot}%{_javadir} -install -m 644 target/%{name}-%{namedversion}.jar \ - %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE.txt
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 1.0-0.6.beta1 +- switch to XMvn +- minor changes to adapt to current guideline + * Tue Feb 19 2013 gil cattaneo puntogil@libero.it 1.0-0.5.beta1 - disabled invoker-plugin in f19
java-sig-commits@lists.fedoraproject.org