2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

List overview
Download

ml December 2013

ml@lists.fedoraproject.org

3 participants
385 discussions

Start a nNew thread

[NLopt/f18] create an empty Makefile on el5 instead of modifying top-level Makefile.am
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: a528487... create an empty Makefile on el5 instead of modifying top-le (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/el6] create an empty Makefile on el5 instead of modifying top-level Makefile.am
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: a528487... create an empty Makefile on el5 instead of modifying top-le (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/el5] create an empty Makefile on el5 instead of modifying top-level Makefile.am
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

commit a528487bb86a88b21b0ea8233bb09792d88da2dc Author: Björn Esser <bjoern.esser(a)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(a)gmail.com> - 2.4-3.git20130903.35e6377 - made %%clean-target conditional on el5

1 0

[NLopt] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: afa0e5a... improved indention (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/f20] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: afa0e5a... improved indention (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/f19] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: afa0e5a... improved indention (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/f18] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: afa0e5a... improved indention (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/el6] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: afa0e5a... improved indention (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[NLopt/el5] improved indention
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

commit afa0e5aceb58b370e441968f58601d6dfa831d86 Author: Björn Esser <bjoern.esser(a)gmail.com> Date: Fri Dec 20 15:29:17 2013 +0100 improved indention NLopt.spec | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) --- diff --git a/NLopt.spec b/NLopt.spec index 2002be6..6c98379 100644 --- a/NLopt.spec +++ b/NLopt.spec @@ -198,10 +198,10 @@ This package contains Python3 bindings for %{name}. %setup -q%{!?rel_build:n %{lc_name}-%{commit_src}}%{?rel_build:n %{lc_name}-%{version}} # Move all %%doc to topdir and append their belonging. -[[ -f README.md ]] && \ +[[ -f README.md ]] && \ mv -f README.md README _topdir="`pwd`" -for _dir in `find . -type d | \ +for _dir in `find . -type d | \ sed -e "/\.libs/d" -e "s/\.\///g" -e "/\./d" | sort -u` do pushd ${_dir} @@ -233,12 +233,12 @@ cp -a . %{py3dir} %build -%configure \ - --enable-shared \ - --enable-maintainer-mode \ - --with-cxx \ +%configure \ + --enable-shared \ + --enable-maintainer-mode \ + --with-cxx \ %if 0%{?fedora} || 0%{?rhel} >= 7 - PYTHON=%{__python2} \ + PYTHON=%{__python2} \ %endif OCT_INSTALL_DIR=%{octpkglibdir} @@ -248,11 +248,11 @@ make %if 0%{?fedora} || 0%{?rhel} >= 7 pushd %{py3dir} -%configure \ - --enable-shared \ - --enable-maintainer-mode \ - --with-cxx \ - PYTHON=%{__python3} \ +%configure \ + --enable-shared \ + --enable-maintainer-mode \ + --with-cxx \ + PYTHON=%{__python3} \ OCT_INSTALL_DIR=%{octpkglibdir} # Parallel-build might fail because of some race-condition @@ -276,9 +276,9 @@ find %{buildroot} -depth -name '*.*a' -print0 | xargs -0 rm -f # Python bits need to be arched, but some end-up in %%{python_sitelib}. %if 0%{?fedora} || 0%{?rhel} >= 7 -[[ "%{python2_sitearch}" != "%{python2_sitelib}" ]] && \ +[[ "%{python2_sitearch}" != "%{python2_sitelib}" ]] && \ mv -f %{buildroot}%{python2_sitelib}/* %{buildroot}%{python2_sitearch} -[[ "%{python3_sitearch}" != "%{python3_sitelib}" ]] && \ +[[ "%{python3_sitearch}" != "%{python3_sitelib}" ]] && \ mv -f %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch} %endif

1 0

[NLopt] move `README.md` only if existing
by Björn 'besser82' Esser 20 Dec '13

20 Dec '13

Summary of changes: 984ca9b... move `README.md` only if existing (*) (*) This commit already existed in another branch; no separate mail sent

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page: