[packages/libfli] - updated to 1.104; tools are gone - removed obsolete nodebug patch

[qboosh]

commit 14a3eba40d761fee9b007df21797e27dd5d57430
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 20 16:33:28 2016 +0100

    - updated to 1.104; tools are gone
    - removed obsolete nodebug patch

 libfli-nodebug.patch | 10 ---------
 libfli.spec          | 59 +++++++++++-----------------------------------------
 2 files changed, 12 insertions(+), 57 deletions(-)
---
diff --git a/libfli.spec b/libfli.spec
index 58973c4..a434174 100644
--- a/libfli.spec
+++ b/libfli.spec
@@ -1,21 +1,19 @@
 Summary:	Finger Lakes Instrumentation software development library
 Summary(pl.UTF-8):	Biblioteka obsługująca urządzenia Finger Lakes Instrumentation
 Name:		libfli
-Version:	1.71
+Version:	1.104
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	http://www.flicamera.com/downloads/fli-dist-%{version}.tgz
-# Source0-md5:	2bcbf524544dd5d6e599a59c5b239ee9
+Source0:	http://www.flicamera.com/downloads/sdk/%{name}-%{version}.zip
+# Source0-md5:	f1a44f770f327ef0a2aeeb4dc3f8df60
 Patch0:		%{name}-shared.patch
-Patch1:		%{name}-nodebug.patch
-Patch2:		%{name}-linux.patch
+Patch1:		%{name}-linux.patch
 URL:		http://www.flicamera.com/software/index.html
-BuildRequires:	cfitsio-devel
-BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sed >= 4.0
+Obsoletes:	libfli-tools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,56 +49,28 @@ Static FLI library.
 %description static -l pl.UTF-8
 Statyczna biblioteka FLI.
 
-%package tools
-Summary:	Tools for Finger Lakes Instrumentation devices
-Summary(pl.UTF-8):	Programy do urządzeń Finger Lakes Instrumentation
-Group:		Applications/Graphics
-Requires:	%{name} = %{version}-%{release}
-
-%description tools
-Tools for Finger Lakes Instrumentation devices.
-
-%description tools -l pl.UTF-8
-Programy do urządzeń Finger Lakes Instrumentation.
-
 %prep
-%setup -q -n fli-dist-%{version}
-%patch0 -p1
-%undos libfli/libfli.c
-%patch1 -p1
-%patch2 -p1
-
-%{__sed} -i -e 's,cfitsio/fitsio\.h,fitsio.h,' libfli/takepic/takepic.c
+%setup -q
+%patch0 -p2
+%undos libfli.c
+%patch1 -p2
 
 %build
-%{__make} -C libfli \
+%{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall" \
-	CPPFLAGS="%{rpmcppflags} -I$(pwd)/libfli -I$(pwd)/libfli/unix" \
+	CPPFLAGS="%{rpmcppflags} -I$(pwd) -I$(pwd)/unix" \
 	LDFLAGS="%{rpmldflags}" \
 	LIBDIR=%{_libdir}
 
-%{__make} -C libfli/flifilter \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -I.." \
-	LOADLIBES="%{rpmldflags} -L../.libs"
-
-%{__make} -C libfli/takepic \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -I.. -DUSEPNG -DUSEFITS" \
-	LOADLIBES="%{rpmldflags} -L../.libs"
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C libfli install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	LIBDIR=%{_libdir} \
 	INCLUDEDIR=%{_includedir}
 
-install -D libfli/takepic/takepic $RPM_BUILD_ROOT%{_bindir}/flitakepic
-install libfli/flifilter/flifilter $RPM_BUILD_ROOT%{_bindir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,8 +91,3 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfli.a
-
-%files tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/flifilter
-%attr(755,root,root) %{_bindir}/flitakepic
diff --git a/libfli-nodebug.patch b/libfli-nodebug.patch
deleted file mode 100644
index 7d215e7..0000000
--- a/libfli-nodebug.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fli-dist-1.71/libfli/libfli.c.orig	2007-02-27 00:18:52.000000000 +0100
-+++ fli-dist-1.71/libfli/libfli.c	2011-09-25 13:44:02.477878556 +0200
-@@ -57,7 +57,6 @@
- 
- flidevdesc_t *devices[MAX_OPEN_DEVICES] = {NULL,};
- 
--#define SHOWFUNCTIONS
- 
- const char* version = \
- "FLI Software Development Library for " __SYSNAME__ " " __LIBFLIVER__;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libfli.git/commitdiff/14a3eba40d761fee9b007df21797e27dd5d57430