diff --git a/.gitignore b/.gitignore index 958cc83..b8c4cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /gpars-1.2.1.tar.bz2 -/gpars-1.2.1-0.6.fc22.noarch.rpm diff --git a/gpars.spec b/gpars.spec index 31b66bf..22fd450 100644 --- a/gpars.spec +++ b/gpars.spec @@ -1,16 +1,11 @@ Name: gpars Version: 1.2.1 -Release: 0.8%{?dist} +Release: 1%{?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.7.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 @@ -26,7 +21,6 @@ BuildRequires: jcsp BuildRequires: netty3 BuildRequires: groovy-lib BuildRequires: multiverse -%endif %description The GPars framework offers Java developers intuitive and safe ways to @@ -40,15 +34,6 @@ 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} . @@ -67,20 +52,17 @@ 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 deleted file mode 100644 index a4365b9..0000000 --- a/mfiles +++ /dev/null @@ -1,3 +0,0 @@ -%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 db66514..a526098 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1ac2ad08fe32a97dd0df6fef6d5f564 gpars-1.2.1-0.6.fc22.noarch.rpm +330122f2fb422c1a892158cd01f8057c gpars-1.2.1.tar.bz2