[gpars] Install artifact

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Nov 17 16:12:17 UTC 2014


commit 458721e91773c24940573d6b9725c877dec5836f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Nov 4 12:21:54 2014 +0100

    Install artifact

 0002-Enable-XMvn-local-mode.patch |   20 ++++++++++++++++----
 gpars.spec                        |    9 ++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/0002-Enable-XMvn-local-mode.patch b/0002-Enable-XMvn-local-mode.patch
index f25e1c5..445029c 100644
--- a/0002-Enable-XMvn-local-mode.patch
+++ b/0002-Enable-XMvn-local-mode.patch
@@ -1,16 +1,16 @@
-From 6c5142433cab5314d62a6308956066df43a34cad Mon Sep 17 00:00:00 2001
+From e854fa72829b6a3d1b3182f6240259173ed8cd28 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 4 Nov 2014 09:36:04 +0100
 Subject: [PATCH 2/2] Enable XMvn local mode
 
 ---
- build.gradle                             | 23 +++--------------------
+ build.gradle                             | 28 +++-------------------------
  buildSrc/build.gradle                    |  6 ------
  buildSrc/src/main/groovy/PdfGuide.groovy | 12 ------------
- 3 files changed, 3 insertions(+), 38 deletions(-)
+ 3 files changed, 3 insertions(+), 43 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index 71fa27c..5e3874b 100644
+index 71fa27c..242227b 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -89,6 +89,7 @@ jar {
@@ -52,6 +52,18 @@ index 71fa27c..5e3874b 100644
  }
  
  task runBenchmarks(type: JavaExec) {
+@@ -300,11 +283,6 @@ task zipSrc(type: Jar, dependsOn: classes) {
+     from sourceSets.main.allSource
+ }
+ 
+-artifacts {
+-    archives(zipSrc)
+-    archives(zipDoc)
+-}
+-
+ task zipSamples(type: Zip) {
+     appendix = 'samples'
+     from sourceSets.test.allSource.matching {
 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
 index 2516924..829175c 100644
 --- a/buildSrc/build.gradle
diff --git a/gpars.spec b/gpars.spec
index 9a11d17..bdcb4ba 100644
--- a/gpars.spec
+++ b/gpars.spec
@@ -6,6 +6,7 @@ License:        XXX
 URL:            http://gpars.codehaus.org
 
 Source0:        http://github.com/GPars/GPars/archive/release-1.2.1.tar.gz
+Source1:        http://repo1.maven.org/maven2/org/codehaus/gpars/gpars/1.2.1/gpars-1.2.1.pom
 
 Patch0:         0001-JSR-166.patch
 Patch1:         0002-Enable-XMvn-local-mode.patch
@@ -25,13 +26,19 @@ XXX
 rm -rf lib/
 %patch0 -p1
 %patch1 -p1
+cp %{SOURCE1} pom.xml
+sed -i s/3.2.9.Final/3.6.6.Final/ pom.xml
+sed -i s/jsr166y/extra166y/ pom.xml
 
 %build
 gradle -s assemble --offline
+%mvn_artifact pom.xml build/libs/gpars-%{version}.jar
 
 %install
+%mvn_install
 
-%files
+%files -f .mfiles
+%doc README.md
 
 %changelog
 * Tue Nov  4 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.1-0.1


More information about the scm-commits mailing list