[gradle] Non-bootstrap build

[Mikolaj Izdebski]

commit af0916c8558d24db28c8a7cde4ff657a5a9d11cd
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Nov 19 12:09:49 2014 +0100

    Non-bootstrap build

 .gitignore   |    2 --
 gradle.spec  |   31 ++++---------------------------
 mfiles       |   15 ---------------
 mfiles-local |    2 --
 sources      |    4 ++--
 5 files changed, 6 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecdc73b..23d4b78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 /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 8f0e04a..520fbde 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -1,6 +1,6 @@
 Name:           gradle
 Version:        2.2
-Release:        0.47%{?dist}
+Release:        1%{?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,13 +8,6 @@ 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
@@ -221,7 +214,6 @@ BuildRequires:  js-jquery
 # connector is merged into XMvn)
 BuildRequires:  xmvn-api
 BuildRequires:  xmvn-launcher
-%endif
 
 # Generic runtime dependencies.
 Requires:       javapackages-tools
@@ -383,17 +375,6 @@ 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
@@ -494,7 +475,6 @@ 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 || :
@@ -516,18 +496,15 @@ 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-1
+- Non-bootstrap build
+
 * Wed Nov 19 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-0.47
 - Bootstrap build using prebuilt binaries
 
diff --git a/sources b/sources
index 24f76f8..a236cda 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a8a7433c852aaa8af83363e838cf3030  gradle-2.2-0.46.fc22.noarch.rpm
-afb2f5fdb3144e99533aa9b2f06b408e  gradle-local-2.2-0.46.fc22.noarch.rpm
+7a512d34e1de503f3857f69e88871886  gradle-2.2-src.zip
+244f92a75cfa50f2c333b2af1d24a7e9  all-released-versions.json