From 46f69db8e70580fb858f014df03f2a1290e52476 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 16 Feb 2009 15:38:46 +0000 Subject: [PATCH] - handle -co option gracefully (#485540) --- swig-1.3.38-rh485540.patch | 12 ++++++++++++ swig.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 swig-1.3.38-rh485540.patch diff --git a/swig-1.3.38-rh485540.patch b/swig-1.3.38-rh485540.patch new file mode 100644 index 0000000..0f520c2 --- /dev/null +++ b/swig-1.3.38-rh485540.patch @@ -0,0 +1,12 @@ +diff -up swig-1.3.38/Source/Modules/main.cxx.rh485540 swig-1.3.38/Source/Modules/main.cxx +--- swig-1.3.38/Source/Modules/main.cxx.rh485540 2009-02-16 16:27:07.000000000 +0100 ++++ swig-1.3.38/Source/Modules/main.cxx 2009-02-16 16:29:05.000000000 +0100 +@@ -954,7 +954,7 @@ int SWIG_main(int argc, char *argv[], La + if (!s) { + Printf(stderr, "Unable to locate '%s' in the SWIG library.\n", input_file); + } else { +- FILE *f = Swig_include_open(outfile); ++ FILE *f = Swig_open(outfile); + if (f) { + fclose(f); + Printf(stderr, "File '%s' already exists. Checkout aborted.\n", outfile); diff --git a/swig.spec b/swig.spec index 8ed2752..244a86a 100644 --- a/swig.spec +++ b/swig.spec @@ -4,12 +4,13 @@ Summary: Connects C/C++/Objective C to some high-level programming languages. Name: swig Version: 1.3.38 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/Tools URL: http://swig.sourceforge.net/ Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz Patch1: swig-1.3.23-pylib.patch +Patch2: swig-1.3.38-rh485540.patch BuildRoot: %{_tmppath}/swig-root BuildRequires: perl, python-devel @@ -33,6 +34,7 @@ tool for building user interfaces. %prep %setup -q -n swig-%{version} %patch1 -p1 -b .pylib +%patch2 -p1 -b .rh485540 %build ./autogen.sh @@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ccache-swig.1* %changelog +* Mon Feb 16 2009 Adam Tkac 1.3.38-2 +- handle -co option gracefully (#485540) + * Thu Feb 12 2009 Adam Tkac 1.3.38-1 - updated to 1.3.38