[gradle] Bootstrap build using prebuilt binaries

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Nov 19 12:11:38 UTC 2014


commit 9bd982d4a9951fbe0a62fda642d518be3dca9826
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Nov 19 08:53:01 2014 +0100

    Bootstrap build using prebuilt binaries
    
    This was granted exception from FPC:
    https://fedorahosted.org/fpc/ticket/471

 .gitignore   |    2 ++
 gradle.spec  |   31 ++++++++++++++++++++++++++++++-
 mfiles       |   15 +++++++++++++++
 mfiles-local |    2 ++
 sources      |    4 ++--
 5 files changed, 51 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23d4b78..ecdc73b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /gradle-2.2-src.zip
 /all-released-versions.json
+/gradle-2.2-0.46.fc22.noarch.rpm
+/gradle-local-2.2-0.46.fc22.noarch.rpm
diff --git a/gradle.spec b/gradle.spec
index 3ceb4cc..8f0e04a 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -1,6 +1,6 @@
 Name:           gradle
 Version:        2.2
-Release:        0.46%{?dist}
+Release:        0.47%{?dist}
 Summary:        Build automation tool
 # Some examples and integration tests are under GNU LGPL and Boost
 # Software License, but are not used to create binary package.
@@ -8,6 +8,13 @@ License:        ASL 2.0
 URL:            http://www.gradle.org/
 BuildArch:      noarch
 
+%if 1
+Source100:      gradle-2.2-0.46.fc22.noarch.rpm
+Source101:      gradle-local-2.2-0.46.fc22.noarch.rpm
+Source200:      mfiles
+Source201:      mfiles-local
+BuildRequires:  javapackages-local
+%else
 Source0:        http://services.gradle.org/distributions/gradle-%{version}-src.zip
 Source1:        http://services.gradle.org/versions/all#/all-released-versions.json
 Source2:        gradle-font-metadata.xml
@@ -214,6 +221,7 @@ BuildRequires:  js-jquery
 # connector is merged into XMvn)
 BuildRequires:  xmvn-api
 BuildRequires:  xmvn-launcher
+%endif
 
 # Generic runtime dependencies.
 Requires:       javapackages-tools
@@ -375,6 +383,17 @@ Requires:       xmvn-launcher
 This package provides XMvn connector for Gradle, which allows Gradle
 to resolve artifacts from system artifact repository.
 
+%if 1
+%prep
+%setup -qcT
+cp %{SOURCE200} .mfiles
+cp %{SOURCE201} .mfiles-local
+%install
+install -d -m 755 %{buildroot}
+cd %{buildroot}
+rpm2cpio %{SOURCE100} | cpio -id
+rpm2cpio %{SOURCE101} | cpio -id
+%else
 %prep
 %setup -q
 %patch0 -p1
@@ -475,6 +494,7 @@ for r in 16 24 32 48 64 128 256; do
     install -p -m 644 subprojects/distributions/src/toplevel/media/gradle-icon-${r}x${r}.png \
         %{buildroot}%{_datadir}/icons/hicolor/${r}x${r}/apps/%{name}.png
 done
+%endif
 
 %post
 update-desktop-database &>/dev/null || :
@@ -496,12 +516,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_javadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%if 1
+%doc %{_docdir}/%{name}/changelog.txt
+%doc %{_docdir}/%{name}/LICENSE
+%doc %{_docdir}/%{name}/NOTICE
+%else
 %doc changelog.txt
 %doc LICENSE NOTICE
+%endif
 
 %files local -f .mfiles-local
 
 %changelog
+* Wed Nov 19 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-0.47
+- Bootstrap build using prebuilt binaries
+
 * Tue Nov 18 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-0.46
 - Remove bundled wrapper JAR
 - Remove bundled JavaScript
diff --git a/mfiles b/mfiles
new file mode 100644
index 0000000..3caeaa2
--- /dev/null
+++ b/mfiles
@@ -0,0 +1,15 @@
+%attr(0644,root,root) /usr/share/maven-metadata/gradle.xml
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-base-services.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-base-services.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-base-services-groovy.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-base-services-groovy.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-core.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-core.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-messaging.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-messaging.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-resources.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-resources.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-tooling-api.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-tooling-api.jar
+%attr(0644,root,root) /usr/share/maven-poms/gradle/gradle-wrapper.pom
+%attr(0644,root,root) /usr/share/java/gradle/gradle-wrapper.jar
diff --git a/mfiles-local b/mfiles-local
new file mode 100644
index 0000000..7e32718
--- /dev/null
+++ b/mfiles-local
@@ -0,0 +1,2 @@
+%attr(0644,root,root) /usr/share/maven-metadata/gradle-local.xml
+%attr(0644,root,root) /usr/share/java/xmvn/xmvn-connector-gradle.jar
diff --git a/sources b/sources
index a236cda..24f76f8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7a512d34e1de503f3857f69e88871886  gradle-2.2-src.zip
-244f92a75cfa50f2c333b2af1d24a7e9  all-released-versions.json
+a8a7433c852aaa8af83363e838cf3030  gradle-2.2-0.46.fc22.noarch.rpm
+afb2f5fdb3144e99533aa9b2f06b408e  gradle-local-2.2-0.46.fc22.noarch.rpm


More information about the scm-commits mailing list