- up to 1.2.0

Changed files:
    fann-python.patch -> 1.4
    fann.spec -> 1.11

diff --git a/fann-python.patch b/fann-python.patch
index 893d5464c1ca26c56527d898a802baae16c4c7ef..e3cfb14474d88f51df07a357dd5856d78fc38492 100644 (file)
--- a/fann-python.patch
+++ b/fann-python.patch
@@ -1,15 +1,20 @@
---- fann-1.1.0-old/python/Makefile     2004-06-06 00:33:09.817753008 +0200
-+++ fann-1.1.0/python/Makefile 2004-06-06 00:32:31.565568224 +0200
-@@ -6,10 +6,10 @@
- all: $(TARGETS)
+--- fann-1.2.0/python/makefile.gnu.old 2005-08-03 11:08:19.000000000 +0200
++++ fann-1.2.0/python/makefile.gnu     2005-08-03 11:06:46.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ TARGETS = _libfann.dll
  
- _%.so: %_wrap.o
--      gcc -shared $< -lfann -o $@ 
-+      gcc -shared ${CFLAGS} $< -L../src/.libs/ -lfann -o $@ 
+-PYTHON=python2.3
++PYTHON=python2.4
+ LIBS=-L. -L/usr/local/lib -L/usr/bin -l$(PYTHON) ../src/fann*.o
+ 
+ all: $(TARGETS)
+@@ -12,7 +12,7 @@
+       gcc $(LIBS) -shared -dll $^ -o $@
  
  %.o: %.c 
--      gcc -c -fpic $< -I/usr/include/python2.3/
-+      gcc ${CFLAGS} -c -fpic $< -I/usr/include/python2.4/ -I/usr/include/python2.3/
+-      gcc -c $< -I/usr/include/$(PYTHON)/
++      gcc -c $< -I/usr/include/$(PYTHON)/ -I../src/include/
  
  %_wrap.c: %.i 
        swig -python $<

diff --git a/fann.spec b/fann.spec
index f29d02a9fcb1adbe59bee07169a88c9a4ed29e16..60ee867c847203a0a1fee0fc2bc34a89cf3ae85f 100644 (file)
--- a/fann.spec
+++ b/fann.spec
@@ -1,12 +1,12 @@
 Summary:       A fast artificial neural network library
 Summary(pl):   Szybka biblioteka do tworzenia sztucznych sieci neuronowych
 Name:          fann
-Version:       1.1.0
-Release:       3
+Version:       1.2.0
+Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: f8280e9849cfbf5ddf769713ce7f7fba
+# Source0-md5: d655f82d4a47e4b697b0083fdaa78c71
 Patch0:                %{name}-python.patch
 URL:           http://fann.sf.net/
 BuildRequires: autoconf
@@ -17,6 +17,7 @@ BuildRequires:        libtool
 BuildRequires: python
 BuildRequires: python-devel >= 1:2.3
 BuildRequires: python-modules
+BuildRequires: sed >= 4.0
 BuildRequires: swig-python >= 1.3.25
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,8 +86,9 @@ Modu
 %{__make}
 %{__make} -C doc html-single
 cd python
+
 CFLAGS="%{rpmcflags}" \
-%{__make}
+%{__make} -f makefile.gnu
 %py_comp .
 %py_ocomp .
 
@@ -99,8 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{py_sitedir}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/{python-%{name}-%{version},%{name}-%{version}}
 
-install python/{fann.pyc,fann.pyo,_fann.so} $RPM_BUILD_ROOT%{py_sitedir}
-install python/simple_train.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
+install python/{fann.pyc,fann.pyo,libfann.pyc,libfann.pyo} $RPM_BUILD_ROOT%{py_sitedir}
 install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -129,6 +130,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/*.so
 %{py_sitedir}/*.py[co]
 %{_examplesdir}/python-%{name}-%{version}