[jgroups212/f17] Fix jgroups212 conflict with jgroups 3

[Matt Spaulding]

commit c0c7ae3c75cdfbad4892e16c109509d0f5f29700
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Thu Aug 23 15:42:33 2012 -0700

    Fix jgroups212 conflict with jgroups 3

 jgroups212-groupid.patch |   13 +++++++++++++
 jgroups212.spec          |   13 +++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/jgroups212-groupid.patch b/jgroups212-groupid.patch
new file mode 100644
index 0000000..feec385
--- /dev/null
+++ b/jgroups212-groupid.patch
@@ -0,0 +1,13 @@
+Index: jgroups212-2.12.3.Final/pom.xml
+===================================================================
+--- jgroups212-2.12.3.Final.orig/pom.xml
++++ jgroups212-2.12.3.Final/pom.xml
+@@ -1,7 +1,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+-    <groupId>org.jgroups</groupId>
++    <groupId>org.jgroups212</groupId>
+     <artifactId>jgroups</artifactId>
+     <packaging>bundle</packaging>
+     <name>JGroups</name>
diff --git a/jgroups212.spec b/jgroups212.spec
index 83f437e..9e2e566 100644
--- a/jgroups212.spec
+++ b/jgroups212.spec
@@ -1,6 +1,6 @@
 Name:     jgroups212
 Version:  2.12.3
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  A toolkit for reliable multicast communication
 
 Group:    Development/Libraries
@@ -11,6 +11,7 @@ URL:      http://www.jgroups.org
 # find jgroups212-2.12.3.Final/ -name '*.jar' -type f -delete
 # tar -cJf jgroups212-2.12.3.Final.tar.xz jgroups212-2.12.3.Final
 Source0:  %{name}-%{version}.Final.tar.xz
+Patch0:   %{name}-groupid.patch
 BuildArch:     noarch
 
 BuildRequires: maven
@@ -49,9 +50,13 @@ Requires:   jpackage-utils
 %setup -q -n %{name}-%{version}.Final
 find . -name \*.jar -exec rm -f {} \;
 
+%patch0 -p1
+
 %build
 # Tests to not current run under maven for this project
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true install \
+    -Dproject.build.sourceEncoding=UTF-8 \
+    javadoc:aggregate
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -82,6 +87,10 @@ chmod 644 README
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Matt Spaulding <mspaulding06 at gmail.com> - 2.12.3-3
+- Changed groupid to org.jgroup212 to fix conflict with jgroup 3
+- Now building with UTF-8 source encoding
+
 * Sun Aug 05 2012 Matt Spaulding <mspaulding06 at gmail.com> - 2.12.3-2
 - Included license in javadoc subpackage
 - Corrected license type