From 769b1ceec17394c77656b0b8df040d42d5a1bbc0 Mon Sep 17 00:00:00 2001 From: Alan Krueger Date: Tue, 8 Jan 2013 11:04:54 -0600 Subject: [PATCH 1/3] fix bug where RPM_ARCH and RPM_OS were being emitted to the RPM scripts in uppercase instead of lowercase, inconsistent with rpmbuild --- History.md | 7 ++++++- .../trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index ef8f468..865bbae 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,8 @@ +v1.3 - 2013-01-08 +================= + * bugfix: RPM_ARCH and RPM_OS were being added to the scripts in + uppercase, which was inconsistent with rpmbuild + v1.2 - 2012-11-13 ================= * bugfix: Use a default value when InetAddress.getLocalHost() throws @@ -38,7 +43,7 @@ v0.6 - 2011-06-27 v0.5 - 2011-06-10 ================= - * add default for sourcePackage because Yum's createrepo assumes your rpm + * add default for sourcePackage because yum createrepo assumes your rpm is a source package without it * default packageName to the project.name diff --git a/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy b/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy index c9cfcba..47f48d2 100755 --- a/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy +++ b/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy @@ -116,7 +116,7 @@ class RpmCopySpecVisitor extends EmptyCopySpecVisitor { String standardScriptDefines() { includeStandardDefines ? String.format(" RPM_ARCH=%s \n RPM_OS=%s \n RPM_PACKAGE_NAME=%s \n RPM_PACKAGE_VERSION=%s \n RPM_PACKAGE_RELEASE=%s \n\n", - task?.arch, task?.os, task?.packageName, task?.version, task?.release) : null + task?.arch?.toString().toLowerCase(), task?.os?.toString()?.toLowerCase(), task?.packageName, task?.version, task?.release) : null } Object scriptWithUtils(File utils, File script) { From 30cee67a37027e57882d391aa4d630c75d05edc8 Mon Sep 17 00:00:00 2001 From: Alan Krueger Date: Tue, 8 Jan 2013 13:10:22 -0600 Subject: [PATCH 2/3] release 1.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a2d833b..4b470e6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'nexus' apply plugin: 'idea' group = 'com.trigonic' -version = '1.3-SNAPSHOT' +version = '1.3' buildscript { repositories { From cc6594a3f9f3da0ea4055201588cf54b2bd8b855 Mon Sep 17 00:00:00 2001 From: Alan Krueger Date: Tue, 8 Jan 2013 13:13:35 -0600 Subject: [PATCH 3/3] prepare for next version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4b470e6..fccb1ca 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'nexus' apply plugin: 'idea' group = 'com.trigonic' -version = '1.3' +version = '1.4-SNAPSHOT' buildscript { repositories {