[rmic-maven-plugin/f19] Fix FTBFS rhbz #914442
mbooth
mbooth at fedoraproject.org
Fri Mar 29 15:14:56 UTC 2013
commit 568313387834066f331d75b6d30830a72e585566
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Fri Mar 29 15:14:06 2013 +0000
Fix FTBFS rhbz #914442
pom-compiler-source-target.patch | 23 +++++++++++++++++++++++
rmic-maven-plugin.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/pom-compiler-source-target.patch b/pom-compiler-source-target.patch
new file mode 100644
index 0000000..72b1dae
--- /dev/null
+++ b/pom-compiler-source-target.patch
@@ -0,0 +1,23 @@
+--- pom.xml.orig 2013-03-29 14:56:54.171650079 +0000
++++ pom.xml 2013-03-29 14:58:21.818455592 +0000
+@@ -156,6 +156,20 @@
+ </plugins>
+ </reporting>
+
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <version>2.5.0</version>
++ <configuration>
++ <source>1.6</source>
++ <target>1.6</target>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++
+ <profiles>
+ <profile>
+ <id>run-its</id>
diff --git a/rmic-maven-plugin.spec b/rmic-maven-plugin.spec
index 9a43c7f..024e61e 100644
--- a/rmic-maven-plugin.spec
+++ b/rmic-maven-plugin.spec
@@ -1,12 +1,13 @@
Name: rmic-maven-plugin
Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Uses the java rmic compiler to generate classes used in remote method invocation
License: MIT
Group: Development/Libraries
URL: http://mojo.codehaus.org/%{name}
Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Patch0: pom-compiler-source-target.patch
BuildArch: noarch
@@ -15,6 +16,7 @@ BuildRequires: maven-local
BuildRequires: maven-plugin-cobertura
BuildRequires: maven-invoker-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-checkstyle-plugin
Requires: java >= 1:1.6.0
Requires: maven
@@ -34,6 +36,8 @@ This package contains the API documentation for %{name}.
%setup -q
sed -i -e "s|groupId>plexus|groupId>org.codehaus.plexus|g" pom.xml
+%patch0 -p0
+
%build
mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:aggregate
@@ -62,6 +66,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Fri Mar 29 2013 Mat Booth <fedora at matbooth.co.uk> - 1.2.1-4
+- Fix FTBFS rhbz #914442
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list