packages: libfli/libfli-shared.patch, libfli/libfli.spec, libfli/libfli-lin...

Sun Sep 25 14:05:07 CEST 2011

Author: qboosh                       Date: Sun Sep 25 12:05:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted shared patch, added nodebug and linux patches; builds now
- added -tools package with flifilter and takepic (the latter packaged as flitakepic)

---- Files affected:
packages/libfli:
   libfli-shared.patch (1.1 -> 1.2) , libfli.spec (1.1 -> 1.2) , libfli-linux.patch (NONE -> 1.1)  (NEW), libfli-nodebug.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libfli/libfli-shared.patch
diff -u packages/libfli/libfli-shared.patch:1.1 packages/libfli/libfli-shared.patch:1.2

--- packages/libfli/libfli-shared.patch:1.1	Tue Aug 23 08:49:09 2011
+++ packages/libfli/libfli-shared.patch	Sun Sep 25 14:05:01 2011
@@ -9,7 +9,7 @@
 +ALLLTOBJ=$(patsubst %.o, %.lo, $(ALLOBJ))
 +
 +libfli.la: libfli.lo $(ALLLTOBJ)
-+	libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(LIBDIR)
++	libtool --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(LIBDIR) -lm
 +
 +%.lo: %.c
 +	libtool --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<

================================================================
Index: packages/libfli/libfli.spec
diff -u packages/libfli/libfli.spec:1.1 packages/libfli/libfli.spec:1.2
--- packages/libfli/libfli.spec:1.1	Tue Aug 23 08:49:09 2011
+++ packages/libfli/libfli.spec	Sun Sep 25 14:05:01 2011
@@ -3,15 +3,20 @@
 Summary(pl.UTF-8):	Biblioteka obsługująca urządzenia Finger Lakes Instrumentation
 Name:		libfli
 Version:	1.71
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Libraries
 Source0:	http://www.flicamera.com/downloads/fli-dist-%{version}.tgz
 # Source0-md5:	2bcbf524544dd5d6e599a59c5b239ee9
 Patch0:		%{name}-shared.patch
+Patch1:		%{name}-nodebug.patch
+Patch2:		%{name}-linux.patch
 URL:		http://www.flicamera.com/software/index.html
+BuildRequires:	cfitsio-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libtool
-BuildRequires:	libusb-compat-devel
+BuildRequires:	rpmbuild(macros) >= 1.566
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,9 +52,26 @@
 %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
 
 %build
 %{__make} -C libfli \
@@ -59,6 +81,16 @@
 	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
 
@@ -67,6 +99,9 @@
 	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
 
@@ -88,11 +123,20 @@
 %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
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/09/25 12:05:01  qboosh
+- adjusted shared patch, added nodebug and linux patches; builds now
+- added -tools package with flifilter and takepic (the latter packaged as flitakepic)
+
 Revision 1.1  2011/08/23 06:49:09  qboosh
-- saving work, not finished yet
+- saving work, not finished yet
\ No newline at end of file

================================================================
Index: packages/libfli/libfli-linux.patch
diff -u /dev/null packages/libfli/libfli-linux.patch:1.1
--- /dev/null	Sun Sep 25 14:05:07 2011
+++ packages/libfli/libfli-linux.patch	Sun Sep 25 14:05:01 2011
@@ -0,0 +1,14 @@
+--- fli-dist-1.71/libfli/unix/linux/libfli-usb-sys.c.orig	2007-02-10 03:15:49.000000000 +0100
++++ fli-dist-1.71/libfli/unix/linux/libfli-usb-sys.c	2011-09-25 13:48:57.277888428 +0200
+@@ -48,8 +48,10 @@
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14))
+ #include <usb.h>
+ #include <linux/usb.h>
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
+ #include <linux/usb_ch9.h>
++#else
++#include <linux/usb/ch9.h>
+ #endif
+ 
+ #include <linux/usbdevice_fs.h>

================================================================
Index: packages/libfli/libfli-nodebug.patch
diff -u /dev/null packages/libfli/libfli-nodebug.patch:1.1
--- /dev/null	Sun Sep 25 14:05:07 2011
+++ packages/libfli/libfli-nodebug.patch	Sun Sep 25 14:05:01 2011
@@ -0,0 +1,10 @@
+--- 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__;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libfli/libfli-shared.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libfli/libfli.spec?r1=1.1&r2=1.2&f=u

