[gpars] Install generated POM instead of prebuilt one

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


commit d5710221d68705a2a94cae35633c0946ac82a90b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Sun Nov 9 20:02:29 2014 +0100

    Install generated POM instead of prebuilt one

 gpars.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gpars.spec b/gpars.spec
index e3c0544..1dd20e6 100644
--- a/gpars.spec
+++ b/gpars.spec
@@ -1,13 +1,12 @@
 Name:           gpars
 Version:        1.2.1
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        XXX
 License:        XXX
 URL:            http://gpars.codehaus.org
 BuildArch:      noarch
 
 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
@@ -27,13 +26,14 @@ 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
+gradle -s install --offline
+
+repo=$HOME/.m2/repository
+pom=$repo/org/codehaus/gpars/gpars/%{version}/gpars-%{version}.pom
+jar=$repo/org/codehaus/gpars/gpars/%{version}/gpars-%{version}.jar
+%mvn_artifact $pom $jar
 
 %install
 %mvn_install
@@ -42,5 +42,8 @@ gradle -s assemble --offline
 %doc README.md
 
 %changelog
+* Sun Nov  9 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.1-0.2
+- Install generated POM instead of prebuilt one
+
 * Tue Nov  4 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.1-0.1
 - Initial packaging


More information about the scm-commits mailing list