- Patch pom

This commit is contained in:
Hui Wang 2010-07-14 06:43:21 +00:00
parent 3568707317
commit 6e658c4f91
2 changed files with 22 additions and 1 deletions

14
guava-pom.patch Normal file
View File

@ -0,0 +1,14 @@
--- 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>

View File

@ -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/guava-libraries
#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@redhat.com> - 05-4
- Patch pom
* Fri Jun 18 2010 Hui Wang <huwang@redhat.com> - 05-3
- Fixed jar name in install section
- Removed spaces in description