Attachment 908728 Details for Bug 1109442 – patch for spec file

[patch] patch for spec file

0001-Update-to-version-17.patch (text/plain), 2.33 KB, created by Zbigniew Jędrzejewski-Szmek on 2014-06-14 00:38:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zbigniew Jędrzejewski-Szmek

Created: 2014-06-14 00:38:32 UTC

Size: 2.33 KB

patch

obsolete

>From 285b49a127155b0cd529c21987d773aeed34223c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
>Date: Fri, 13 Jun 2014 20:16:40 -0400
>Subject: [PATCH] Update to version 17
>
>---
> guava.spec | 19 +++++++++++--------
> sources    |  2 +-
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
>diff --git a/guava.spec b/guava.spec
>index d6ac566..cbd7f3c 100644
>--- a/guava.spec
>+++ b/guava.spec
>@@ -1,26 +1,25 @@
> Name:          guava
>-Version:       15.0
>-%global commit 7ce15119ae3b
>+Version:       17.0
>+%global commit 904234dc2f36
> Release:       1%{?dist}
> Summary:       Google Core Libraries for Java
> License:       ASL 2.0 
> URL:           http://code.google.com/p/guava-libraries
>-Source0:       http://guava-libraries.googlecode.com/archive/v%{version}.zip
>+#Source0:       http://guava-libraries.googlecode.com/archive/v%{version}.zip
>+Source0:       v%{version}.zip
> 
> BuildRequires: java-devel >= 0:1.7.0
>-BuildRequires: mvn(org.sonatype.oss:oss-parent)
>-
> BuildRequires: maven-local
>-BuildRequires: maven-dependency-plugin
> 
> BuildRequires: mvn(com.google.code.findbugs:jsr305) >= 0-0.6.20090319svn
> BuildRequires: ant
>+BuildRequires: apache-ivy
> 
> BuildArch:     noarch
> 
> %description
>-Guava is a suite of core and expanded libraries that include 
>-utility classes, Google's collections, io classes, and much 
>+Guava is a suite of core and expanded libraries that include
>+utility classes, Googleâs collections, io classes, and much
> much more.
> This project is a complete packaging of all the Guava libraries
> into a single jar.  Individual portions of Guava can be used
>@@ -41,6 +40,7 @@ find . -name '*.jar' -delete
> %pom_disable_module guava-tests
> %pom_remove_plugin :animal-sniffer-maven-plugin guava
> %pom_remove_plugin :maven-gpg-plugin
>+%pom_remove_dep jdk:srczip guava
> 
> %build
> 
>@@ -58,6 +58,9 @@ find . -name '*.jar' -delete
> %doc COPYING
> 
> %changelog
>+* Fri Jun 13 2014 Zbigniew JÄdrzejewski-Szmek <zbyszek@in.waw.pl> 17.0-1
>+- Update to latest upstream version (#1109442).
>+
> * Mon Oct 28 2013 Zbigniew JÄdrzejewski-Szmek <zbyszek@in.waw.pl> 15.0-1
> - Update to latest upstream version (rhbz#1023832).
> 
>diff --git a/sources b/sources
>index 201ecaa..edfcac4 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-67df359de6188e54aac4c7c1a48f7613  v15.0.zip
>+a6560c8737b5103d09f3c83fcf72a661  v17.0.zip
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1109442: 908728 | 908965