commit a528487bb86a88b21b0ea8233bb09792d88da2dc Author: Björn Esser bjoern.esser@gmail.com Date: Fri Dec 20 16:49:31 2013 +0100
create an empty Makefile on el5 instead of modifying top-level Makefile.am
NLopt.spec | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) --- diff --git a/NLopt.spec b/NLopt.spec index 6c98379..5ee9d91 100644 --- a/NLopt.spec +++ b/NLopt.spec @@ -219,7 +219,11 @@ done %{?!el5:sed -i -e 's!^AC_PROG_LIBTOOL!LT_INIT!g' configure.ac}
# On el5 we need to exclude anything SWIG-related. -%{?el5:sed -i -e 's!swig!!g' Makefile.am} +#%%{?el5:sed -i -e 's!swig!!g' Makefile.am} +%{?el5: _file="swig/Makefile.am" && \ + mv -f ${_file} ${_file}.orig && \ + touch ${_file} && \ + touch -r ${_file}.orig ${_file}}
# Bootstrapping once before we create a copy in %%{py3dir}. touch swig/nlopt.scm.in @@ -396,6 +400,7 @@ octave -H -q --no-window-system --no-site-file --eval "pkg rebuild" - changed `%%global lc_name` to `%%define lc_name`, because of globbing problems - use `tr` instead of shell-builtin for `%%define lc_name` - move `README.md` only if existing +- create an empty Makefile on el5 instead of modifying top-level Makefile.am
* Fri Dec 20 2013 Björn Esser bjoern.esser@gmail.com - 2.4-3.git20130903.35e6377 - made %%clean-target conditional on el5