[swig/f15] Update to 2.0.4.

[Adam Tkac]

commit 5425f1816fb1ce33804afc665aa9f5b1f3505af1
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Jun 20 16:30:37 2011 +0200

    Update to 2.0.4.
    
    - patches merged
     - swig200-rh666429.patch
     - swig200-rh623854.patch
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>
    
    Conflicts:
    
    	swig.spec

 swig.spec              |   12 ++++---
 swig200-rh623854.patch |   92 ------------------------------------------------
 swig200-rh666429.patch |   67 -----------------------------------
 3 files changed, 7 insertions(+), 164 deletions(-)
---
diff --git a/swig.spec b/swig.spec
index 462233b..9f2f46d 100644
--- a/swig.spec
+++ b/swig.spec
@@ -3,15 +3,13 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name: swig
-Version: 2.0.3
+Version: 2.0.4
 Release: 1%{?dist}
 License: GPLv3+ and BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
 Source: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
 Patch1: swig-1.3.23-pylib.patch
-Patch2: swig200-rh623854.patch
-Patch3: swig200-rh666429.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl, python-devel, pcre-devel
@@ -44,8 +42,6 @@ This package contains documentation for SWIG and useful examples
 %prep
 %setup -q -n swig-%{version}
 %patch1 -p1 -b .pylib
-%patch2 -p1 -b .rh623854
-%patch3 -p1 -b .rh666429
 
 # as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2
 # (specific req/prov filtering). Before you remove this hack make sure you don't
@@ -117,6 +113,12 @@ rm -rf %{buildroot}
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Mon Jun 20 2011 Adam Tkac <atkac redhat com> 2.0.4-1
+- update to 2.0.4
+- patches merged
+  - swig200-rh666429.patch
+  - swig200-rh623854.patch
+
 * Fri Apr 22 2011 Adam Tkac <atkac redhat com> 2.0.3-1
 - update to 2.0.3
 - swig202-rh691513.patch merged