rpms/PyAmanith/F-8 PyAmanith-0.3.34-buildfix.patch, NONE, 1.1 PyAmanith-0.3.34-headersfix.patch, NONE, 1.1 PyAmanith.spec, NONE, 1.1 sources, 1.1, 1.2

Tom Callaway (spot) fedora-extras-commits at redhat.com
Mon Mar 10 19:45:23 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/PyAmanith/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21453/F-8

Modified Files:
	sources 
Added Files:
	PyAmanith-0.3.34-buildfix.patch 
	PyAmanith-0.3.34-headersfix.patch PyAmanith.spec 
Log Message:

branching


PyAmanith-0.3.34-buildfix.patch:

--- NEW FILE PyAmanith-0.3.34-buildfix.patch ---
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
@@ -16,7 +16,7 @@ libs = ["amanith"]
 inc = [join("changes", "include"), join(amanith_base, "include"), "include"]
 lib = [join(amanith_base, "lib")]
 cc_args = []
-swig_args = ["-Ibuild/amanith"]
+swig_args = ["-Ichanges/include", "-Iinclude", "-I/usr/include"]
 
 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):
         relPath = join(root, file).replace(source + os.sep, "")
         shutil.copy(join(source, relPath), join(target, relPath))
   
-  def run(self):
-    # Ultimately this should use patch(1) or something, but for now
-    # we just copy the stuff over.
-    if not os.path.isdir(join("build", "amanith")):
-      os.makedirs(join("build", "amanith"))
-      shutil.copytree(join(amanith_base, "include"), join("build", "amanith", "include"))
-    self.copy("changes", join("build", "amanith"))
-    _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)
                         
 setup(name = 'PyAmanith',
       version = '0.3.34',

PyAmanith-0.3.34-headersfix.patch:

--- NEW FILE PyAmanith-0.3.34-headersfix.patch ---
diff -up PyAmanith-0.3.34/headers.i.BAD PyAmanith-0.3.34/headers.i
--- PyAmanith-0.3.34/headers.i.BAD	2007-11-15 09:55:15.000000000 -0500
+++ PyAmanith-0.3.34/headers.i	2007-11-15 09:57:38.000000000 -0500
@@ -1,59 +1,59 @@
 /* All the rest comes from the headers */
-%include <build/amanith/include/amanith/gglobal.h>
-%include <build/amanith/include/amanith/geometry/ginterval.h>
-%include <build/amanith/include/amanith/geometry/gvect.h>
-%include <build/amanith/include/amanith/geometry/gquat.swig.h>
-%include <build/amanith/include/amanith/geometry/gmatrix.h>
-%include <build/amanith/include/amanith/support/gutilities.h>
-%include <build/amanith/include/amanith/gclassid.h>
-%include <build/amanith/include/amanith/gelement.h>
-%include <build/amanith/include/amanith/gerror.h>
-%include <build/amanith/include/amanith/gimpexp.h>
-%include <build/amanith/include/amanith/gkernel.h>
-%include <build/amanith/include/amanith/gmath.h>
-%include <build/amanith/include/amanith/gmultiproperty.h>
-%include <build/amanith/include/amanith/gopenglext.h>
-%include <build/amanith/include/amanith/gpluglib.h>
-%include <build/amanith/include/amanith/gproperty.h>
-%include <build/amanith/include/amanith/geometry/gaabox.h>
-%include <build/amanith/include/amanith/geometry/gaffineparts.h>
-%include <build/amanith/include/amanith/geometry/garea.h>
-%include <build/amanith/include/amanith/geometry/gaxisangle.swig.h>
-%include <build/amanith/include/amanith/geometry/gdistance.h>
-%include <build/amanith/include/amanith/geometry/gintersect.h>
-%include <build/amanith/include/amanith/geometry/glineseg.h>
-%include <build/amanith/include/amanith/geometry/goobox.h>
-%include <build/amanith/include/amanith/geometry/gplane.h>
-%include <build/amanith/include/amanith/geometry/gquat.h>
-%include <build/amanith/include/amanith/geometry/gray.h>
-%include <build/amanith/include/amanith/geometry/gsphere.h>
-%include <build/amanith/include/amanith/geometry/gxform.h>
-%include <build/amanith/include/amanith/geometry/gxformconv.h>
-%include <build/amanith/include/amanith/numerics/geigen.h>
-%include <build/amanith/include/amanith/numerics/gfilter.h>
-%include <build/amanith/include/amanith/numerics/gintegration.h>
-%include <build/amanith/include/amanith/1d/gcurve1d.h>
-%include <build/amanith/include/amanith/1d/gmulticurve1d.h>
-%include <build/amanith/include/amanith/1d/gbsplinecurve1d.swig.h>
-%include <build/amanith/include/amanith/1d/ghermitecurve1d.h>
-%include <build/amanith/include/amanith/1d/gpolylinecurve1d.h>
-%include <build/amanith/include/amanith/2d/gcurve2d.h>
-%include <build/amanith/include/amanith/2d/gmulticurve2d.h>
-%include <build/amanith/include/amanith/2d/ganimtrsnode2d.h>
-%include <build/amanith/include/amanith/2d/gbeziercurve2d.h>
-%include <build/amanith/include/amanith/2d/gbsplinecurve2d.h>
-%include <build/amanith/include/amanith/2d/gellipsecurve2d.h>
-%include <build/amanith/include/amanith/2d/ghermitecurve2d.h>
-%include <build/amanith/include/amanith/2d/gfont2d.h>
-%include <build/amanith/include/amanith/2d/gmesh2d.h>
-%include <build/amanith/include/amanith/2d/gpath2d.h>
-%include <build/amanith/include/amanith/2d/gpixelmap.h>
-%include <build/amanith/include/amanith/2d/gpolylinecurve2d.h>
-%include <build/amanith/include/amanith/2d/gtesselator2d.h>
-%include <build/amanith/include/amanith/2d/gtracer2d.h>
-%include <build/amanith/include/amanith/rendering/gdrawstyle.h>
-%include <build/amanith/include/amanith/rendering/gdrawboard.swig.h>
-%include <build/amanith/include/amanith/rendering/gopenglboard.h>
-%include <build/amanith/include/amanith/support/gavltree.h>
-/*%include <build/amanith/include/amanith/support/gmetaprogramming.h>*/
-%include <build/amanith/include/amanith/support/gsvgpathtokenizer.h>
+%include <amanith/gglobal.h>
+%include <amanith/geometry/ginterval.h>
+%include <amanith/geometry/gvect.h>
+%include <amanith/geometry/gquat.swig.h>
+%include <amanith/geometry/gmatrix.h>
+%include <amanith/support/gutilities.h>
+%include <amanith/gclassid.h>
+%include <amanith/gelement.h>
+%include <amanith/gerror.h>
+%include <amanith/gimpexp.h>
+%include <amanith/gkernel.h>
+%include <amanith/gmath.h>
+%include <amanith/gmultiproperty.h>
+%include <amanith/gopenglext.h>
+%include <amanith/gpluglib.h>
+%include <amanith/gproperty.h>
+%include <amanith/geometry/gaabox.h>
+%include <amanith/geometry/gaffineparts.h>
+%include <amanith/geometry/garea.h>
+%include <amanith/geometry/gaxisangle.swig.h>
+%include <amanith/geometry/gdistance.h>
+%include <amanith/geometry/gintersect.h>
+%include <amanith/geometry/glineseg.h>
+%include <amanith/geometry/goobox.h>
+%include <amanith/geometry/gplane.h>
+%include <amanith/geometry/gquat.h>
+%include <amanith/geometry/gray.h>
+%include <amanith/geometry/gsphere.h>
+%include <amanith/geometry/gxform.h>
+%include <amanith/geometry/gxformconv.h>
+%include <amanith/numerics/geigen.h>
+%include <amanith/numerics/gfilter.h>
+%include <amanith/numerics/gintegration.h>
+%include <amanith/1d/gcurve1d.h>
+%include <amanith/1d/gmulticurve1d.h>
+%include <amanith/1d/gbsplinecurve1d.swig.h>
+%include <amanith/1d/ghermitecurve1d.h>
+%include <amanith/1d/gpolylinecurve1d.h>
+%include <amanith/2d/gcurve2d.h>
+%include <amanith/2d/gmulticurve2d.h>
+%include <amanith/2d/ganimtrsnode2d.h>
+%include <amanith/2d/gbeziercurve2d.h>
+%include <amanith/2d/gbsplinecurve2d.h>
+%include <amanith/2d/gellipsecurve2d.h>
+%include <amanith/2d/ghermitecurve2d.h>
+%include <amanith/2d/gfont2d.h>
+%include <amanith/2d/gmesh2d.h>
+%include <amanith/2d/gpath2d.h>
+%include <amanith/2d/gpixelmap.h>
+%include <amanith/2d/gpolylinecurve2d.h>
+%include <amanith/2d/gtesselator2d.h>
+%include <amanith/2d/gtracer2d.h>
+%include <amanith/rendering/gdrawstyle.h>
+%include <amanith/rendering/gdrawboard.swig.h>
+%include <amanith/rendering/gopenglboard.h>
+%include <amanith/support/gavltree.h>
+/*%include <amanith/support/gmetaprogramming.h>*/
+%include <amanith/support/gsvgpathtokenizer.h>
diff -up PyAmanith-0.3.34/include/pyamanith.h.BAD PyAmanith-0.3.34/include/pyamanith.h
--- PyAmanith-0.3.34/include/pyamanith.h.BAD	2007-11-15 11:03:36.000000000 -0500
+++ PyAmanith-0.3.34/include/pyamanith.h	2007-11-15 11:03:44.000000000 -0500
@@ -59,7 +59,7 @@
 #include <amanith/numerics/geigen.h>
 #include <amanith/numerics/gfilter.h>
 #include <amanith/numerics/gintegration.h>
-#include <amanith/rendering/gdrawboard.h>
+#include <amanith/rendering/gdrawboard.swig.h>
 #include <amanith/rendering/gdrawstyle.h>
 #include <amanith/rendering/gopenglboard.h>
 #include <amanith/support/gavltree.h>


--- NEW FILE PyAmanith.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:			PyAmanith
Summary: 		Python bindings for Amanith
Version:		0.3.35
Release:		2%{?dist}
# Exception is permission to link to Amanith, which is QPL.
License:		GPLv2+ with exceptions
Group:			Development/Tools
Source0:		http://muksuluuri.ath.cx/~skyostil/projects/pyamanith/dist/%{name}-%{version}.tar.gz
URL:			http://unrealvoodoo.org/hiteck/projects/pyamanith/
Patch0:			PyAmanith-0.3.34-buildfix.patch
Patch1:			PyAmanith-0.3.34-headersfix.patch
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		python-devel, amanith-devel, swig

%description
PyAmanith is a Python wrapper for the Amanith (http://www.amanith.org) 2D 
vector graphics library. It strives to offer a pythonic interface to the 
library and make all its features accessible.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
# convert to utf-8, fix end of line encoding
for i in README PKG-INFO; do
  sed -i -e 's|\r||g' $i
  iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,}
  mv $i{.utf8,}
done
sed -i -e 's|\r||g' changes/include/amanith/1d/gbsplinecurve1d.swig.h
chmod -x changes/include/amanith/1d/gbsplinecurve1d.swig.h

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod 755 $RPM_BUILD_ROOT%{python_sitearch}/_amanith.so

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README PKG-INFO COPYING
%{python_sitearch}/_amanith.so
%{python_sitearch}/amanith.py*
%if 0%{?fedora} >= 9
%{python_sitearch}/*.egg-info
%endif

%changelog
* Thu Feb 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-2
- include COPYING file
- fix permissions on .so file
- pickup egg-info for f9+

* Thu Nov 15 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.35-1
- Initial package for Fedora


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/PyAmanith/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Mar 2008 19:02:48 -0000	1.1
+++ sources	10 Mar 2008 19:44:47 -0000	1.2
@@ -0,0 +1 @@
+eb833bc3b6ac6c30eb7252756dde3786  PyAmanith-0.3.35.tar.gz




More information about the fedora-extras-commits mailing list