packages: fann/fann.spec - fixed build with python 2.7 - added -link.patch ...

megabajt megabajt at pld-linux.org
Sat Nov 27 18:10:09 CET 2010


Author: megabajt                     Date: Sat Nov 27 17:10:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with python 2.7
- added -link.patch (libraries have to be linked with -lm)
- added -fPIC to CFLAGS (fixes build on x86_64)
- more verbose files
- release 2

---- Files affected:
packages/fann:
   fann.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/fann/fann.spec
diff -u packages/fann/fann.spec:1.18 packages/fann/fann.spec:1.19
--- packages/fann/fann.spec:1.18	Mon Feb 12 22:23:55 2007
+++ packages/fann/fann.spec	Sat Nov 27 18:10:04 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Szybka biblioteka do tworzenia sztucznych sieci neuronowych
 Name:		fann
 Version:	2.0.0
-Release:	1
+Release:	2
 License:	LGPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/fann/%{name}-%{version}.tar.bz2
@@ -11,12 +11,13 @@
 Source1:	http://dl.sourceforge.net/fann/%{name}_doc_complete_1.0.pdf
 # Source1-md5:	8117a677afc79dfaa31de39ca84d82da
 Patch0:		%{name}-python.patch
+Patch1:		%{name}-link.patch
 URL:		http://leenissen.dk/fann/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	python
-BuildRequires:	python-devel >= 1:2.3
+BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	python-modules
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python >= 1.3.25
@@ -89,6 +90,7 @@
 %setup -q
 cp %{SOURCE1} .
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -96,10 +98,11 @@
 %{__autoconf}
 %{__automake}
 %configure
-%{__make}
+%{__make} \
+	CFLAGS="%{rpmcflags} -fPIC"
 cd python
 
-CFLAGS="%{rpmcflags}" \
+CFLAGS="%{rpmcflags} -fPIC" \
 %{__make}
 %py_comp .
 %py_ocomp .
@@ -131,12 +134,25 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libdoublefann.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdoublefann.so.2
+%attr(755,root,root) %{_libdir}/libfann.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfann.so.2
+%attr(755,root,root) %{_libdir}/libfixedfann.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfixedfann.so.2
+%attr(755,root,root) %{_libdir}/libfloatfann.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfloatfann.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libdoublefann.so
+%attr(755,root,root) %{_libdir}/libfann.so
+%attr(755,root,root) %{_libdir}/libfixedfann.so
+%attr(755,root,root) %{_libdir}/libfloatfann.so
+%{_libdir}/libdoublefann.la
+%{_libdir}/libfann.la
+%{_libdir}/libfixedfann.la
+%{_libdir}/libfloatfann.la
 %{_includedir}/*.h
 %{_pkgconfigdir}/fann.pc
 %{_examplesdir}/%{name}-%{version}
@@ -147,13 +163,17 @@
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdoublefann.a
+%{_libdir}/libfann.a
+%{_libdir}/libfixedfann.a
+%{_libdir}/libfloatfann.a
 
 %files -n python-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/pyfann/*.so
 %dir %{py_sitedir}/pyfann
 %{py_sitedir}/pyfann/*.py[co]
+%{py_sitedir}/pyfann-*.egg-info
 %{_examplesdir}/python-%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -162,6 +182,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/11/27 17:10:04  megabajt
+- fixed build with python 2.7
+- added -link.patch (libraries have to be linked with -lm)
+- added -fPIC to CFLAGS (fixes build on x86_64)
+- more verbose files
+- release 2
+
 Revision 1.18  2007/02/12 21:23:55  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fann/fann.spec?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list