From da8a226255ec5d0a2a2e38405fcc668198b12ada Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mar 04 2017 22:24:51 +0000 Subject: Updated to 0.2.10 upstream release --- diff --git a/.gitignore b/.gitignore index c926544..b05bf70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bakefile-0.2.8.tar.gz /bakefile-0.2.9.tar.gz +/bakefile-0.2.10.tar.gz diff --git a/bakefile-format-security.patch b/bakefile-format-security.patch deleted file mode 100644 index e1f9747..0000000 --- a/bakefile-format-security.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/bkl_c_wrap.c b/src/bkl_c_wrap.c -index 44f857a..2120781 100644 ---- a/src/bkl_c_wrap.c -+++ b/src/bkl_c_wrap.c -@@ -850,7 +850,7 @@ SWIG_Python_AddErrorMsg(const char* mesg) - Py_DECREF(old_str); - Py_DECREF(value); - } else { -- PyErr_Format(PyExc_RuntimeError, mesg); -+ PyErr_Format(PyExc_RuntimeError, "%s", mesg); - } - } - diff --git a/bakefile-rtti-support.patch b/bakefile-rtti-support.patch deleted file mode 100644 index 1796f83..0000000 --- a/bakefile-rtti-support.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bc9790672fe7fa238e15628c87a64aa7cbe1f45f Mon Sep 17 00:00:00 2001 -From: Raul Tambre -Date: Tue, 3 Jan 2017 14:37:44 +0200 -Subject: [PATCH] Fix the option for turning off RTTI support in msvc format - -"/GR-" must be explicitly specified, not using "/GR" is not enough with any -version of MSVC from this millennium. - -See https://github.com/vslavik/bakefile/pull/85 ---- - NEWS | 6 ++++++ - rules/makefile_defs_msvc.bkl | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 2fb0b90..ab7358c 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,4 +1,10 @@ - -+Version 0.3.0 -+------------- -+ -+- msvc: Fix RTTI off flag (Raul Tambre) -+ -+ - Version 0.2.9 - ------------- - -diff --git a/rules/makefile_defs_msvc.bkl b/rules/makefile_defs_msvc.bkl -index 6c46665..9823654 100644 ---- a/rules/makefile_defs_msvc.bkl -+++ b/rules/makefile_defs_msvc.bkl -@@ -94,7 +94,7 @@ - $(__FLAG_MSVC_WARNINGS_DEFAULT) - $(__FLAG_MSVC_WARNINGS_MAX) - /GR -- -+ /GR- - /EHsc - - diff --git a/bakefile-swig-interface.patch b/bakefile-swig-interface.patch deleted file mode 100644 index e3073c6..0000000 --- a/bakefile-swig-interface.patch +++ /dev/null @@ -1,31 +0,0 @@ -From db05b1b83a09bc4b0487be6f7d145907f17c4c12 Mon Sep 17 00:00:00 2001 -From: ARATA Mizuki -Date: Fri, 9 Jan 2015 18:16:02 +0900 -Subject: [PATCH] Fix SWIG interface file. - ---- - src/bkl_c.i | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/bkl_c.i b/src/bkl_c.i -index 842c8f8..f23950a 100644 ---- a/src/bkl_c.i -+++ b/src/bkl_c.i -@@ -42,6 +42,8 @@ - return NULL; - } - -+%inline %{ -+ - /* Tokenizes input string \a expr that may contain Python expressions - inside $(...) and calls \a textCallb(\a moreArgs, text) - for text parts (outside $(...)) and -@@ -92,6 +94,8 @@ extern void proxydict_hijack(PyObject *data, PyObject *dict); - /* add new dictionary to the proxy: */ - extern void proxydict_add(PyObject *data, PyObject *dict); - -+%} -+ - %pythoncode %{ - class ProxyDictionary: - def __init__(self): diff --git a/bakefile.spec b/bakefile.spec index 6dbd0dd..df9e3f6 100644 --- a/bakefile.spec +++ b/bakefile.spec @@ -1,15 +1,12 @@ Name: bakefile -Version: 0.2.9 -Release: 10%{?dist} +Version: 0.2.10 +Release: 1%{?dist} Summary: A cross-platform, cross-compiler native makefiles generator Group: Development/Tools License: MIT URL: http://www.bakefile.org/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: bakefile-028-fix-import.patch -Patch1: bakefile-format-security.patch -Patch2: bakefile-swig-interface.patch -Patch3: bakefile-rtti-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-python python-devel swig @@ -23,9 +20,6 @@ makefile (autoconf's Makefile.in, Visual C++ project, bcc makefile etc.) %prep %setup -q %patch0 -p0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build pushd src @@ -54,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Sat Mar 04 2017 Scott Talbert - 0.2.10-1 +- Updated to 0.2.10 upstream release + * Fri Feb 17 2017 Scott Talbert - 0.2.9-10 - Fix segfault issue by patching swig interface file (#1419786) - Apply patch from upstream for fixing RTTI support diff --git a/sources b/sources index b9b4d54..ccab7c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b53813d155df1a45371abc8f781e6d88 bakefile-0.2.9.tar.gz +SHA512 (bakefile-0.2.10.tar.gz) = 198186eeb4b1e559c5ae914fef8cd4d451fccbb5b5ad9da4178707d1d6a5c4048f930e898be19f5e90008641dbb69f15efd6de73ee21ed89e0426129a55b11e7