Merge pull request #24 from AlanKrueger/master

v1.3 - fix bug in RPM_ARCH and RPM_OS for scripts
TrigonicSolutions · Jan 8, 2013 · 647abd5 · 647abd5
2 parents e1c1367 + cc6594a
commit 647abd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'nexus'
 apply plugin: 'idea'
 
 group = 'com.trigonic'
-version = '1.3-SNAPSHOT'
+version = '1.4-SNAPSHOT'
 
 buildscript {
     repositories {

diff --git a/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy b/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmCopySpecVisitor.groovy
@@ -117,7 +117,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) {