[gradle] Simplify gradle-local-mode.patch

[Mikolaj Izdebski]

commit 2a6023dbb7e720513ffee8c8837d268602d9500a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 17 12:39:10 2014 +0200

    Simplify gradle-local-mode.patch

 gradle-local-mode.patch |   73 ++++++++++++++++++++--------------------------
 gradle.spec             |    5 ++-
 2 files changed, 36 insertions(+), 42 deletions(-)
---
diff --git a/gradle-local-mode.patch b/gradle-local-mode.patch
index 9233fe5..0db7c9f 100644
--- a/gradle-local-mode.patch
+++ b/gradle-local-mode.patch
@@ -1,110 +1,101 @@
-From 8bbf70f42bd73c205f5a4446ec7d2d0bd0734b97 Mon Sep 17 00:00:00 2001
+From b512f941f12409f2ad3553f28b7149179c7011c4 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 15 Oct 2014 14:23:30 +0200
 Subject: [PATCH] Gradle local mode
 
 ---
- build.gradle                                         | 2 +-
- buildSrc/build.gradle                                | 3 +--
- gradle/analytics.gradle                              | 3 +--
- subprojects/docs/docs.gradle                         | 2 +-
- subprojects/docs/src/transforms/release-notes.gradle | 2 +-
- subprojects/performance/performance.gradle           | 2 +-
- subprojects/reporting/reporting.gradle               | 2 +-
- 7 files changed, 7 insertions(+), 9 deletions(-)
+ build.gradle                                         | 1 +
+ buildSrc/build.gradle                                | 1 +
+ gradle/analytics.gradle                              | 1 +
+ subprojects/docs/docs.gradle                         | 1 +
+ subprojects/docs/src/transforms/release-notes.gradle | 1 +
+ subprojects/performance/performance.gradle           | 1 +
+ subprojects/reporting/reporting.gradle               | 1 +
+ 7 files changed, 7 insertions(+)
 
 diff --git a/build.gradle b/build.gradle
-index 7de0a9a..c40a709 100644
+index 7de0a9a..4a17934 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -125,7 +125,7 @@ allprojects {
+@@ -125,6 +125,7 @@ allprojects {
      group = 'org.gradle'
  
      repositories {
--        maven { url 'https://repo.gradle.org/gradle/libs' }
 +        add(new XMvn())
+         maven { url 'https://repo.gradle.org/gradle/libs' }
      }
  }
- 
 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
-index 9e03b4f..d2a56a1 100644
+index 9e03b4f..5a9e72f 100644
 --- a/buildSrc/build.gradle
 +++ b/buildSrc/build.gradle
-@@ -21,8 +21,7 @@ apply plugin: 'idea'
+@@ -21,6 +21,7 @@ apply plugin: 'idea'
  apply plugin: 'eclipse'
  
  repositories {
--    maven { url 'https://repo.gradle.org/gradle/libs' }
--    mavenCentral()
 +    add(new XMvn())
+     maven { url 'https://repo.gradle.org/gradle/libs' }
+     mavenCentral()
  }
- 
- dependencies {
 diff --git a/gradle/analytics.gradle b/gradle/analytics.gradle
-index eb800ac..28b03a8 100644
+index eb800ac..1f1d901 100644
 --- a/gradle/analytics.gradle
 +++ b/gradle/analytics.gradle
-@@ -16,8 +16,7 @@
+@@ -16,6 +16,7 @@
  
  buildscript {
      repositories {
--        maven { url 'https://repo.gradle.org/gradle/libs' }
--        ivy { url 'https://repo.gradle.org/gradle/gradleware' }
 +        add(new XMvn())
+         maven { url 'https://repo.gradle.org/gradle/libs' }
+         ivy { url 'https://repo.gradle.org/gradle/gradleware' }
      }
- 
-     dependencies {
 diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
-index c91faba..bec66b2 100755
+index c91faba..c6db38b 100755
 --- a/subprojects/docs/docs.gradle
 +++ b/subprojects/docs/docs.gradle
-@@ -31,7 +31,7 @@ apply plugin: 'jsoup'
+@@ -31,6 +31,7 @@ apply plugin: 'jsoup'
  apply plugin: 'javascript-base'
  
  repositories {
--    javaScript.googleApis()
 +    add(new XMvn())
+     javaScript.googleApis()
  
      ivy {
-         name "Google Fonts"
 diff --git a/subprojects/docs/src/transforms/release-notes.gradle b/subprojects/docs/src/transforms/release-notes.gradle
-index 627cd58..fca1107 100644
+index 627cd58..5a429b0 100644
 --- a/subprojects/docs/src/transforms/release-notes.gradle
 +++ b/subprojects/docs/src/transforms/release-notes.gradle
-@@ -1,6 +1,6 @@
+@@ -1,5 +1,6 @@
  buildscript {
      repositories {
--        mavenCentral()
 +        add(new XMvn())
+         mavenCentral()
      }
      dependencies {
-         classpath('com.uwyn:jhighlight:1.0') {
 diff --git a/subprojects/performance/performance.gradle b/subprojects/performance/performance.gradle
-index 1945006..a743a7b 100644
+index 1945006..572aa31 100644
 --- a/subprojects/performance/performance.gradle
 +++ b/subprojects/performance/performance.gradle
-@@ -7,7 +7,7 @@ configurations {
+@@ -7,6 +7,7 @@ configurations {
  }
  
  repositories {
--    javaScript.googleApis()
 +    add(new XMvn())
+     javaScript.googleApis()
  }
  
- dependencies {
 diff --git a/subprojects/reporting/reporting.gradle b/subprojects/reporting/reporting.gradle
-index ad0c7c2..15e0509 100644
+index ad0c7c2..dba97e1 100644
 --- a/subprojects/reporting/reporting.gradle
 +++ b/subprojects/reporting/reporting.gradle
-@@ -5,7 +5,7 @@ configurations {
+@@ -5,6 +5,7 @@ configurations {
  }
  
  repositories {
--    javaScript.googleApis()
 +    add(new XMvn())
+     javaScript.googleApis()
  }
  
- dependencies {
 -- 
 1.9.3
 
diff --git a/gradle.spec b/gradle.spec
index a5eab8e..7a2f34b 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -4,7 +4,7 @@
 
 Name:           gradle
 Version:        2.1
-Release:        0.4%{?dist}
+Release:        0.5%{?dist}
 Summary:        XXX
 License:        XXX
 URL:            XXX
@@ -57,6 +57,9 @@ jar cfm %{buildroot}%{_datadir}/%{name}/lib/plugins/gradle-core-impl-2.1*.jar ME
 %doc changelog.txt LICENSE NOTICE getting-started.html
 
 %changelog
+* Fri Oct 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.5
+- Simplify gradle-local-mode.patch
+
 * Thu Oct 16 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.4
 - Build in local mode