From 33f74be267ee9348eaf8726bae3072a091b4bc72 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Nov 19 2014 12:23:16 +0000 Subject: Fix bootstrap build --- diff --git a/.gitignore b/.gitignore index b8c4cd5..958cc83 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gpars-1.2.1.tar.bz2 +/gpars-1.2.1-0.6.fc22.noarch.rpm diff --git a/gpars.spec b/gpars.spec index 22fd450..06e595d 100644 --- a/gpars.spec +++ b/gpars.spec @@ -1,11 +1,16 @@ Name: gpars Version: 1.2.1 -Release: 1%{?dist} +Release: 0.8%{?dist} Summary: Groovy Parallel Systems License: ASL 2.0 and Public Domain URL: http://gpars.codehaus.org BuildArch: noarch +%if 1 +Source100: gpars-1.2.1-0.6.fc22.noarch.rpm +Source200: mfiles +BuildRequires: javapackages-local +%else # ./generate-tarball.sh %{version} Source0: %{name}-%{version}.tar.bz2 Source1: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -21,6 +26,7 @@ BuildRequires: jcsp BuildRequires: netty3 BuildRequires: groovy-lib BuildRequires: multiverse +%endif %description The GPars framework offers Java developers intuitive and safe ways to @@ -34,6 +40,15 @@ mutually cooperating high-level concurrency abstractions, such as Dataflow operators, Promises, CSP, Actors, Asynchronous Functions, Agents and Parallel Collections. +%if 1 +%prep +%setup -qcT +cp %{SOURCE200} .mfiles +%install +install -d -m 755 %{buildroot} +cd %{buildroot} +rpm2cpio %{SOURCE100} | cpio -id +%else %prep %setup -q cp %{SOURCE1} . @@ -52,17 +67,20 @@ jar=$repo/org/codehaus/gpars/gpars/%{version}/gpars-%{version}.jar %install %mvn_install +%endif %files -f .mfiles %dir %{_javadir}/%{name} %dir %{_mavenpomdir}/%{name} +%if 1 +%doc %{_docdir}/%{name}/LICENSE-2.0.txt +%doc %{_docdir}/%{name}/README.md +%else %doc LICENSE-2.0.txt %doc README.md +%endif %changelog -* Wed Nov 19 2014 Mikolaj Izdebski - 1.2.1-1 -- Non-bootstrap build - * Wed Nov 19 2014 Mikolaj Izdebski - 1.2.1-0.8 - Bootstrap build using prebuilt binaries diff --git a/mfiles b/mfiles new file mode 100644 index 0000000..a4365b9 --- /dev/null +++ b/mfiles @@ -0,0 +1,3 @@ +%attr(0644,root,root) /usr/share/maven-metadata/gpars.xml +%attr(0644,root,root) /usr/share/maven-poms/gpars/gpars.pom +%attr(0644,root,root) /usr/share/java/gpars/gpars.jar diff --git a/sources b/sources index a526098..db66514 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -330122f2fb422c1a892158cd01f8057c gpars-1.2.1.tar.bz2 +a1ac2ad08fe32a97dd0df6fef6d5f564 gpars-1.2.1-0.6.fc22.noarch.rpm