diff --git a/8.patch b/8.patch deleted file mode 100644 index 71c87d1..0000000 --- a/8.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 29995967e6ffb9b67ff239b7c2549348d90187da Mon Sep 17 00:00:00 2001 -From: Christoph Junghans -Date: Fri, 10 Nov 2017 09:05:29 -0700 -Subject: [PATCH] circle_init_builtin: added missing return value - ---- - src/circle-init.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/circle-init.c b/src/circle-init.c -index 771d382..da605ae 100644 ---- a/src/circle-init.c -+++ b/src/circle-init.c -@@ -171,6 +171,8 @@ circle_init_builtin (WORD_LIST *list) - for (func = all_circle_builtins; *func; func++) - if (load_circle_builtin(*func) != EXECUTION_SUCCESS) - return EXECUTION_FAILURE; -+ -+ return EXECUTION_SUCCESS; - } - - /* Define the documentation for the circle_init builtin. */ diff --git a/mpibash-1.2.tar.gz b/mpibash-1.2.tar.gz deleted file mode 100644 index 2ee91e3..0000000 --- a/mpibash-1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c2faaa74464111205dbae4799bd89c2425810ec3708d004237b42d620c8be57 -size 347083 diff --git a/mpibash-1.3.tar.gz b/mpibash-1.3.tar.gz new file mode 100644 index 0000000..138d746 --- /dev/null +++ b/mpibash-1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab39dcc0eadce765abaf685e73d38f4351e3229fdb4302aee4b9e6e70d431d99 +size 369803 diff --git a/mpibash.changes b/mpibash.changes index f2e896a..b975f3f 100644 --- a/mpibash.changes +++ b/mpibash.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 22 23:26:48 UTC 2017 - junghans@votca.org + +- Version bump to v1.3 + * drop 8.patch - got merge upstream + * "This release includes a few bug fixes, a few improvements to + the build process, and some extra information added to the + documentation." + ------------------------------------------------------------------- Tue Nov 14 02:02:24 UTC 2017 - jengelh@inai.de diff --git a/mpibash.spec b/mpibash.spec index f1b1667..4231ac6 100644 --- a/mpibash.spec +++ b/mpibash.spec @@ -22,15 +22,13 @@ %endif Name: mpibash -Version: 1.2 +Version: 1.3 Release: 0 Summary: Parallel scripting right from the Bourne-Again Shell License: GPL-3.0+ Group: Productivity/Networking/Other Url: https://github.com/lanl/MPI-Bash Source0: https://github.com/lanl/MPI-Bash/releases/download/v%{version}/mpibash-%{version}.tar.gz -#PATCH-FIX-UPSTREAM - 8.patch - circle_init_builtin: fix return value -Patch0: https://patch-diff.githubusercontent.com/raw/lanl/MPI-Bash/pull/8.patch BuildRequires: bash-devel >= 4.4 BuildRequires: %{mpi_implem} BuildRequires: %{mpi_implem}-devel @@ -60,11 +58,10 @@ This package contains example scripts for mpibash. %prep %setup -q -%patch0 -p1 %build . %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh -%configure --with-bashdir=/usr/include/bash --docdir=%{_docdir}/%{name} --with-plugindir=%{_libdir}/%{name}/ CC=mpicc +%configure --docdir=%{_docdir}/%{name} --with-plugindir=%{_libdir}/%{name}/ CC=mpicc %make_build %install