[packages/libfli] Rel 2
arekm
arekm at pld-linux.org
Sun Mar 15 01:20:52 CET 2026
commit 7cd27df6a4c68d6c9ff79f95a567ade9073f0a76
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Mar 15 01:20:45 2026 +0100
Rel 2
libfli-linux.patch | 14 --------------
libfli.spec | 5 ++---
2 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/libfli.spec b/libfli.spec
index 116877d..7c56752 100644
--- a/libfli.spec
+++ b/libfli.spec
@@ -2,13 +2,13 @@ Summary: Finger Lakes Instrumentation software development library
Summary(pl.UTF-8): Biblioteka obsługująca urządzenia Finger Lakes Instrumentation
Name: libfli
Version: 1.104
-Release: 1
+Release: 2
License: BSD
Group: Libraries
Source0: http://www.flicamera.com/downloads/sdk/%{name}-%{version}.zip
# Source0-md5: f1a44f770f327ef0a2aeeb4dc3f8df60
Patch0: %{name}-shared.patch
-Patch1: %{name}-linux.patch
+# Patch1 removed: upstream 1.104 already includes linux/usb/ch9.h fix
URL: http://www.flicamera.com/software/index.html
BuildRequires: libtool
BuildRequires: rpmbuild(macros) >= 1.566
@@ -53,7 +53,6 @@ Statyczna biblioteka FLI.
%setup -q
%patch -P0 -p2
%undos libfli.c
-%patch -P1 -p2
%build
%{__make} \
diff --git a/libfli-linux.patch b/libfli-linux.patch
deleted file mode 100644
index 4a68401..0000000
--- a/libfli-linux.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libfli.git/commitdiff/7cd27df6a4c68d6c9ff79f95a567ade9073f0a76
More information about the pld-cvs-commit
mailing list