rpms/guava/devel guava-pom.patch,NONE,1.1 guava.spec,1.1,1.2

[Hui Wang]

Author: huwang

Update of /cvs/pkgs/rpms/guava/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16841

Modified Files:
	guava.spec 
Added Files:
	guava-pom.patch 
Log Message:
* Wed Jul 14 2010 Hui wang <huwang at redhat.com> - 05-4
- Patch pom


guava-pom.patch:
 pom.xml |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE guava-pom.patch ---
--- pom.xml.orig	2010-06-02 01:36:53.000000000 +0800
+++ pom.xml	2010-07-14 11:55:46.000000000 +0800
@@ -2,11 +2,6 @@
 <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>
-  <parent>
-    <groupId>com.google</groupId>
-    <artifactId>google</artifactId>
-    <version>5</version>
-  </parent>
   <groupId>com.google.guava</groupId>
   <artifactId>guava</artifactId>
   <version>r05</version>


Index: guava.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guava/devel/guava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- guava.spec	21 Jun 2010 03:28:16 -0000	1.1
+++ guava.spec	14 Jul 2010 06:43:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           guava
 Version:        05
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Google Core Libraries for Java
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://code.google.com/p
 #svn export http://guava-libraries.googlecode.com/svn/tags/release05/ guava-r05
 #tar jcf guava-r05.tar.bz2 guava-r05/
 Source0:        %{name}-r%{version}.tar.bz2
+#Remove parent definition which doesn't really to be used
+Patch0:        %{name}-pom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -45,6 +47,8 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{name}-r%{version}
 
+%patch0 -p0
+
 sed -i "s/jsr305.jar/jsr-305.jar/" build.xml
 
 %build
@@ -96,6 +100,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jul 14 2010 Hui wang <huwang at redhat.com> - 05-4
+- Patch pom
+
 * Fri Jun 18 2010 Hui Wang <huwang at redhat.com> - 05-3
 - Fixed jar name in install section
 - Removed spaces in description