[fann] update to the version 2.2.0 (thanks to Jaroslav Reznik)

[Tomas Smetana]

commit 8411e3b2db972774b2d0fdfc0b53beeea0b0237d
Author: Tomas Smetana <tsmetana at redhat.com>
Date:   Tue Apr 24 14:50:12 2012 +0200

    update to the version 2.2.0 (thanks to Jaroslav Reznik)

 .gitignore                 |    1 +
 fann-2.2.0-pkgconfig.patch |   12 ++++++++++++
 fann.spec                  |   37 ++++++++++++++++++++++---------------
 sources                    |    2 +-
 4 files changed, 36 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e17d8b..e93a2a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fann-2.0.0.tar.bz2
+/FANN-2.2.0-Source.tar.gz
diff --git a/fann-2.2.0-pkgconfig.patch b/fann-2.2.0-pkgconfig.patch
new file mode 100644
index 0000000..ae7c551
--- /dev/null
+++ b/fann-2.2.0-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -up FANN-2.2.0-Source/CMakeLists.txt.pkgconfig FANN-2.2.0-Source/CMakeLists.txt
+--- FANN-2.2.0-Source/CMakeLists.txt.pkgconfig	2012-04-24 14:33:08.201999985 +0200
++++ FANN-2.2.0-Source/CMakeLists.txt	2012-04-24 14:33:52.907999769 +0200
+@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+ 
+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY )
+ 
+-SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
++#SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
+ 
+ ########### install files ###############
+ 
diff --git a/fann.spec b/fann.spec
index f528456..148eab0 100644
--- a/fann.spec
+++ b/fann.spec
@@ -1,14 +1,15 @@
 Summary:    A fast artificial neural network library
 Name:       fann
-Version:    2.0.0
-Release:    9%{?dist}
+Version:    2.2.0
+Release:    1%{?dist}
 License:    LGPLv2+
 Group:      Development/Libraries
 URL:        http://fann.sf.net/
-Source:     http://downloads.sourceforge.net/fann/%{name}-%{version}.tar.bz2
+Source:     http://downloads.sourceforge.net/fann/fann/2.2.0/FANN-%{version}-Source.tar.gz
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: cmake
+Patch0:     fann-2.2.0-pkgconfig.patch
 
-%define fann_includedir %{_includedir}/fann
 
 %description
 Fast Artificial Neural Network (FANN) Library is written in ANSI C.
@@ -26,18 +27,22 @@ This package is only needed if you intend to develop and/or compile programs
 based on the FANN library.
 
 %prep
-%setup -q
+%setup -q -n FANN-%{version}-Source
+%patch0 -p1
 LIBS=-lm
 export LIBS
 
-%configure --includedir=%{fann_includedir} --disable-static
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} -DPKGCONFIG_INSTALL_DIR=/%{_lib}/pkgconfig ..
+popd
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} install
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %clean
@@ -49,27 +54,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc COPYING.txt README.txt
 %{_libdir}/libdoublefann.so.2
-%{_libdir}/libdoublefann.so.2.0.0
+%{_libdir}/libdoublefann.so.2.2.0
 %{_libdir}/libfloatfann.so.2
-%{_libdir}/libfloatfann.so.2.0.0
+%{_libdir}/libfloatfann.so.2.2.0
 %{_libdir}/libfixedfann.so.2
-%{_libdir}/libfixedfann.so.2.0.0
+%{_libdir}/libfixedfann.so.2.2.0
 %{_libdir}/libfann.so.2
-%{_libdir}/libfann.so.2.0.0
+%{_libdir}/libfann.so.2.2.0
 
 %files devel
 %defattr(-,root,root)
-%doc doc/fann_en.pdf doc/*.txt
 %{_libdir}/pkgconfig/fann.pc
 %{_libdir}/libdoublefann.so
 %{_libdir}/libfann.so
 %{_libdir}/libfixedfann.so
 %{_libdir}/libfloatfann.so
-%{fann_includedir}
+%{_includedir}/*.h
 
 %changelog
+* Tue Apr 24 2012 Tomas Smetana <tsmetana at redhat.com> - 2.2.0-1
+- update to the version 2.2.0 (thanks to Jaroslav Reznik)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index bf19983..a0b6459 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4224efa533265dcf39237667973d0e20  fann-2.0.0.tar.bz2
+c9d6c8da5bb70276352a1718a668562c  FANN-2.2.0-Source.tar.gz