msimacek pushed to gpars (master). "Port build script to current gradle"

[notifications at fedoraproject.org]

>From 8a68dcf343ec35cfece690645c1ec4d20aef9e14 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Mon, 30 Mar 2015 16:30:53 +0200
Subject: Port build script to current gradle


diff --git a/0001-Port-build-script-to-current-gradle.patch b/0001-Port-build-script-to-current-gradle.patch
new file mode 100644
index 0000000..4bbeaf3
--- /dev/null
+++ b/0001-Port-build-script-to-current-gradle.patch
@@ -0,0 +1,25 @@
+From b9f04148267adc6e60539411e141ff93859bae96 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Mon, 30 Mar 2015 16:26:57 +0200
+Subject: [PATCH] Port build script to current gradle
+
+---
+ build.gradle | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 71fa27c..5e0dba8 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -322,7 +322,7 @@ task zipJavaDemo(type: Zip) {
+ 
+ task zipDist(type: Zip) {
+     from jar.outputs.files
+-    from(runtimeClasspath) {
++    from(sourceSets.main.runtimeClasspath) {
+         include('jsr166*', 'netty*', 'multiverse*')
+     }
+     from('licenses') {
+-- 
+2.1.0
+
diff --git a/gpars.spec b/gpars.spec
index 8272f28..52ed29d 100644
--- a/gpars.spec
+++ b/gpars.spec
@@ -1,6 +1,6 @@
 Name:           gpars
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Groovy Parallel Systems
 License:        ASL 2.0 and Public Domain
 URL:            http://gpars.codehaus.org
@@ -13,6 +13,7 @@ Source2:        generate-tarball.sh
 
 Patch0:         0001-JSR-166.patch
 Patch1:         0002-Enable-XMvn-local-mode.patch
+Patch2:         0001-Port-build-script-to-current-gradle.patch
 
 BuildRequires:  gradle-local >= 2.1-0.10
 BuildRequires:  apache-parent
@@ -41,6 +42,7 @@ rm -rf lib/ gradle/wrapper/
 rm -rf src/main/groovy/groovyx/gpars/extra166y/
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 gradle -s install --offline
@@ -60,6 +62,9 @@ jar=$repo/org/codehaus/gpars/gpars/%{version}/gpars-%{version}.jar
 %doc README.md
 
 %changelog
+* Mon Mar 30 2015 Michael Simacek <msimacek at redhat.com> - 1.2.1-3
+- Port build script to current gradle
+
 * Mon Feb  2 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.1-2
 - Use generic netty3 compat version
 - Resolves: rhbz#1187710
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gpars.git/commit/?h=master&id=8a68dcf343ec35cfece690645c1ec4d20aef9e14