[rmic-maven-plugin/f14/master] Set maven2.jpp.mode to true Extensive use of buildroot-macro Moved from Development/Tools -> Develop

spike spike at fedoraproject.org
Wed Sep 22 06:24:26 UTC 2010


commit c71ac7f9b9debcf48a4d45e2712d590b8066e3c3
Author: spike <spike at fedoraproject.org>
Date:   Wed Sep 22 08:20:14 2010 +0200

    Set maven2.jpp.mode to true
    Extensive use of buildroot-macro
    Moved from Development/Tools -> Development/Libraries
    Set maven.test.failure.ignore to true (do tests again, but ignore failures)
    Changed summary to be more descriptive
    Removed BuildArch from javadoc subpackage
    Added BR mojo-parent to fix FTBFS (#631167)

 .project               |   11 +++++++++++
 rmic-maven-plugin.spec |   39 +++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/.project b/.project
new file mode 100644
index 0000000..16f2aba
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>rmic-maven-plugin_git</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/rmic-maven-plugin.spec b/rmic-maven-plugin.spec
index d2caea5..2de48a7 100644
--- a/rmic-maven-plugin.spec
+++ b/rmic-maven-plugin.spec
@@ -1,13 +1,14 @@
 Name:             rmic-maven-plugin
 Version:          1.1
-Release:          3%{?dist}
-Summary:          RMI Compiler Maven Plugin
+Release:          4%{?dist}
+Summary:          Uses the java rmic compiler to generate classes used in remote method invocation
 License:          MIT
-Group:            Development/Tools
+Group:            Development/Libraries
 URL:              http://mojo.codehaus.org/%{name}
 
-Source0:          http://repo2.maven.org/maven2/org/codehaus/mojo/rmic-maven-plugin/%{version}/%{name}-%{version}-source-release.zip
+Source0:          http://repo2.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:        noarch
 
 BuildRequires:    asm2
@@ -25,6 +26,7 @@ BuildRequires:    maven-plugin-plugin >= 2.5
 BuildRequires:    maven-resources-plugin >= 2.2
 BuildRequires:    maven-shared-invoker >= 2.0.11
 BuildRequires:    maven-surefire-maven-plugin
+BuildRequires:    mojo-parent
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
@@ -45,7 +47,6 @@ classes used in remote method invocation.
 Summary:          Javadoc for %{name}
 Group:            Documentation
 Requires:         jpackage-utils
-BuildArch:        noarch
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -58,7 +59,8 @@ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
         -e \
-        -Dmaven.test.skip=true \
+        -Dmaven2.jpp.mode=true \
+        -Dmaven.test.failure.ignore=true \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
 
@@ -66,19 +68,19 @@ mvn-jpp \
 rm -rf $RPM_BUILD_ROOT
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 0755 %{buildroot}%{_javadir}
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +105,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 15 2010 Chris Spike <chris.spike at arcor.de> 1.1-4
+- Set maven2.jpp.mode to true
+- Extensive use of buildroot-macro
+- Moved from Development/Tools -> Development/Libraries
+- Set maven.test.failure.ignore to true (do tests again, but ignore failures)
+- Changed summary to be more descriptive
+- Removed BuildArch from javadoc subpackage
+- Added BR mojo-parent to fix FTBFS (#631167)
+
 * Mon Jul 12 2010 Chris Spike <chris.spike at arcor.de> 1.1-3
 - Changed 'Source0' to match upstream source release zip-file
 


More information about the scm-commits mailing list