rpms/PyAmanith/devel PyAmanith-0.3.34-buildfix.patch, 1.1, 1.2 PyAmanith.spec, 1.1, 1.2

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/PyAmanith/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28526

Modified Files:
	PyAmanith-0.3.34-buildfix.patch PyAmanith.spec 
Log Message:
fix FTBFS

PyAmanith-0.3.34-buildfix.patch:

Index: PyAmanith-0.3.34-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/devel/PyAmanith-0.3.34-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyAmanith-0.3.34-buildfix.patch	10 Mar 2008 19:41:00 -0000	1.1
+++ PyAmanith-0.3.34-buildfix.patch	24 Sep 2008 18:16:01 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:33:20.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:34:14.000000000 -0500
+diff -up PyAmanith-0.3.35/setup.py.BAD PyAmanith-0.3.35/setup.py
+--- PyAmanith-0.3.35/setup.py.BAD	2008-09-24 14:04:33.000000000 -0400
++++ PyAmanith-0.3.35/setup.py	2008-09-24 14:05:39.000000000 -0400
 @@ -16,7 +16,7 @@ libs = ["amanith"]
  inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
  lib = [join(amanith_base, "lib")]
@@ -10,10 +10,7 @@
  
  if os.name == "nt":
    if debug:
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:51:39.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:51:45.000000000 -0500
-@@ -38,15 +38,6 @@ class build_ext(_build_ext):
+@@ -38,20 +38,8 @@ class build_ext(_build_ext):
          relPath = join(root, file).replace(source + os.sep, "")
          shutil.copy(join(source, relPath), join(target, relPath))
    
@@ -27,20 +24,11 @@
 -    _build_ext.run(self)
 -
  ext_amanith = Extension('_amanith', ['amanith.i'],
-                         include_dirs = inc,
-                         library_dirs = lib,
-diff -up PyAmanith-0.3.34/setup.py.BAD PyAmanith-0.3.34/setup.py
---- PyAmanith-0.3.34/setup.py.BAD	2007-11-15 09:53:25.000000000 -0500
-+++ PyAmanith-0.3.34/setup.py	2007-11-15 09:53:39.000000000 -0500
-@@ -39,10 +39,7 @@ class build_ext(_build_ext):
-         shutil.copy(join(source, relPath), join(target, relPath))
-   
- ext_amanith = Extension('_amanith', ['amanith.i'],
 -                        include_dirs = inc,
 -                        library_dirs = lib,
 -                        libraries = libs,
 -                        extra_compile_args = cc_args)
-+			swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
++                        swig_opts = swig_args, extra_compile_args = swig_args, libraries = libs)
                          
  setup(name = 'PyAmanith',
-       version = '0.3.34',
+       version = '0.3.35',


Index: PyAmanith.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/devel/PyAmanith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyAmanith.spec	10 Mar 2008 19:41:00 -0000	1.1
+++ PyAmanith.spec	24 Sep 2008 18:16:01 -0000	1.2
@@ -3,7 +3,7 @@
 Name:			PyAmanith
 Summary: 		Python bindings for Amanith
 Version:		0.3.35
-Release:		2%{?dist}
+Release:		3%{?dist}
 # Exception is permission to link to Amanith, which is QPL.
 License:		GPLv2+ with exceptions
 Group:			Development/Tools
@@ -53,6 +53,9 @@
 %endif
 
 %changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-3
+- rework PyAmanith-0.3.34-buildfix.patch to apply without fuzz
+
 * Thu Feb 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-2
 - include COPYING file
 - fix permissions on .so file