From 79a6376c9469f85ca3a741633d359e4ede2d78bb Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sat, 16 Jul 2011 16:25:30 +0000 Subject: [PATCH] upgrading package: gradle 1.0m1 -> 1.0m3 --- gradle/gradle.sh | 6 +++++- gradle/gradle.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gradle/gradle.sh b/gradle/gradle.sh index e22536dfff..310242dd0e 100644 --- a/gradle/gradle.sh +++ b/gradle/gradle.sh @@ -7,11 +7,15 @@ eval `@l_prefix@/bin/java-toolkit -e` GRADLE_HOME="@l_prefix@/lib/gradle" export GRADLE_HOME +GRADLE_APP_BASE_NAME="gradle" +export GRADLE_APP_BASE_NAME exec @l_prefix@/bin/java \ -Xmx512m \ + $JAVA_OPTS \ + $GRADLE_OPTS \ -cp $GRADLE_HOME/lib/gradle-launcher-*.jar \ - -Dorg.gradle.appname="gradle" \ + -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \ org.gradle.launcher.GradleMain \ ${1+"$@"} diff --git a/gradle/gradle.spec b/gradle/gradle.spec index 5490bd2d35..8e6fd1c105 100644 --- a/gradle/gradle.spec +++ b/gradle/gradle.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 1.0m1 -%define V_dist 1.0-milestone-1 +%define V_opkg 1.0m3 +%define V_dist 1.0-milestone-3 # package information Name: gradle @@ -36,7 +36,7 @@ Class: EVAL Group: Building License: Apache Version: %{V_opkg} -Release: 20110522 +Release: 20110716 # list of sources Source0: http://gradle.artifactoryonline.com/gradle/distributions/gradle-%{V_dist}-bin.zip @@ -72,6 +72,7 @@ PreReq: OpenPKG, openpkg >= 20100101, java, JAVA-JDK %install %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gradle/lib/core-impl \ $RPM_BUILD_ROOT%{l_prefix}/lib/gradle/lib/plugins %{l_shtool} install -c -m 755 %{l_value -s -a} \ %{SOURCE gradle.sh} \ @@ -82,6 +83,9 @@ PreReq: OpenPKG, openpkg >= 20100101, java, JAVA-JDK %{l_shtool} install -c -m 644 \ lib/plugins/*.jar \ $RPM_BUILD_ROOT%{l_prefix}/lib/gradle/lib/plugins/ + %{l_shtool} install -c -m 644 \ + lib/core-impl/*.jar \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gradle/lib/core-impl/ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files