[fityk] updated to latest upstream version

[nonamedotc]

commit 4cc197920c2a4e358ec79db6ce119827f9db8a52
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date:   Fri Jun 6 13:14:45 2014 -0500

    updated to latest upstream version
    
    - built against patched cmpfit
    - Added BuildRequires for cmpfit-devel

 .gitignore          |    1 +
 cmpfit_config.patch |   12 ++++++++++++
 editlink.html       |   10 ++++++++++
 fityk.spec          |   40 ++++++++++++++++++++++++++++------------
 img.tar.gz          |  Bin 0 -> 135018 bytes
 sources             |    2 +-
 6 files changed, 52 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b2818b..e2713ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ fityk-0.8.8.tar.bz2
 /fityk-0.9.4.tar.bz2
 /fityk-0.9.8.tar.bz2
 /v1.2.1.tar.gz
+/fityk-1.2.9.tar.bz2
diff --git a/cmpfit_config.patch b/cmpfit_config.patch
new file mode 100644
index 0000000..b9ab10c
--- /dev/null
+++ b/cmpfit_config.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2014-06-05 13:30:50.859363408 -0500
++++ configure.ac	2014-06-05 13:31:36.838557047 -0500
+@@ -101,6 +101,9 @@
+ # see m4/ax_cxx_have_isfinite.m4
+ AX_CXX_HAVE_ISFINITE
+ 
++AC_CHECK_HEADER([mpfit.h], [], [AC_MSG_ERROR(
++ [cmpfit headers were not found. You may need to install cmpfit-devel first.])])
++
+ AC_CHECK_HEADER([xylib/xylib.h], [], [AC_MSG_ERROR(
+  [xylib headers were not found. You may need to install xylib first.])])
+ 
diff --git a/editlink.html b/editlink.html
new file mode 100644
index 0000000..a786a2f
--- /dev/null
+++ b/editlink.html
@@ -0,0 +1,10 @@
+{# modified basic/sourcelink.html (BSD license) #}
+{%- if show_source and has_source and sourcename %}
+  <h3>{{ _('This Page') }}</h3>
+  <ul class="this-page-menu">
+    <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+           rel="nofollow">{{ _('Show Source') }}</a></li>
+    <li><a href="https://github.com/wojdyr/fityk/blob/master/doc/{{ sourcename[:-4] }}.rst"
+           rel="nofollow">{{ 'Edit on GitHub' }}</a></li>
+  </ul>
+{%- endif %}
diff --git a/fityk.spec b/fityk.spec
index e1a22c7..7404fb1 100644
--- a/fityk.spec
+++ b/fityk.spec
@@ -1,10 +1,16 @@
 Name:		fityk
 Summary:	Non-linear curve fitting and data analysis
-Version:	1.2.1
-Release:	2%{?dist}
+Version:	1.2.9
+Release:	1%{?dist}
 
-Source0:	https://github.com/wojdyr/fityk/archive/v%{version}.tar.gz
-Patch0:		remove-mpfit.patch
+Source0:	https://github.com/wojdyr/fityk/releases/download/v1.2.9/%{name}-1.2.9.tar.bz2
+# missing files for building documentation
+Source1:	https://raw.githubusercontent.com/wojdyr/fityk/master/doc/editlink.html
+# the tarball was created from img directory in the github master branch
+Source2:	img.tar.gz
+
+# patch to check for cmpfit dependency
+Patch0:		cmpfit_config.patch
 
 URL:		http://fityk.nieto.pl/
 License:	GPLv2+
@@ -21,6 +27,7 @@ BuildRequires:	lua-devel >= 5.1
 BuildRequires:	libtool
 BuildRequires:	swig
 BuildRequires:	python-sphinx
+BuildRequires:	cmpfit-devel
 
 Requires:	gnuplot
 
@@ -42,17 +49,24 @@ use of %{name}, you will need to install %{name}-devel.
 %prep
 %setup -q
 %patch0 -p0
+mv %{S:1} doc/
+tar xf %{S:2}
+mv img doc/
+
+# rmeove pre-built documentation
+rm -fr doc/html
 
 #building against wxGTK3
 sed -i 's/\=wx-config/\=wx-config-3.0/' m4/wxwin.m4
 
-#disable MPfit
-rm -fr fityk/cmpfit fityk/CMPfit*
-sed -i 's/swig\/luarun.h \\/swig\/luarun.h/' fityk/Makefile.am
-sed -i '26d' fityk/Makefile.am
+#unbundle cmpfit
+rm -fr fityk/cmpfit
+sed -i 's/\#include \"cmpfit\/mpfit.h\"/\#include \"mpfit.h\"/' fityk/CMPfit.h
+#sed -i 's/swig\/luarun.h \\/swig\/luarun.h/' fityk/Makefile.am
+sed -i 's/cmpfit\/mpfit.c cmpfit\/mpfit.h/mpfit.h/' fityk/Makefile.am
 
 %build
-export CFLAGS="%{optflags}"
+export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{optflags} -lmpfit"
 autoreconf -iv
 %configure --disable-xyconvert
 
@@ -61,7 +75,7 @@ autoreconf -iv
 #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make V=1 %{?_smp_mflags}
-# make html doc
+# build html documentation
 pushd doc
 make html
 popd 
@@ -114,8 +128,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/%{name}/samples/*.cc
 
 %changelog
-* Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 1.2.1-2
-- Rebuild for boost 1.55.0
+* Thu Jun 05 2014 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 1.2.9-1
+- updated to latest upstream version
+- built against patched cmpfit
+- Added BuildRequires for cmpfit-devel
 
 * Fri Feb 28 2014 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 1.2.1-1
 - updated to latest upstream version
diff --git a/img.tar.gz b/img.tar.gz
new file mode 100644
index 0000000..106aae2
Binary files /dev/null and b/img.tar.gz differ
diff --git a/sources b/sources
index fa3d82f..06890d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5650cb33d1fbc6aa73ca21405ccf1b78  v1.2.1.tar.gz
+c7b68aecdd17071d5eebf2dc1774245f  fityk-1.2.9.tar.bz2