[packages/isight-firmware-tools] update to 1.6

[glen]

commit 273e3f8999bcf0a63f2674f12a00cb0ea28d972d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 6 20:32:04 2013 +0200

    update to 1.6

 format-security.patch      | 36 ++++++++++++++++++++++++++++++++++++
 isight-firmware-tools.spec | 45 +++++++++++++++++++++++++++------------------
 2 files changed, 63 insertions(+), 18 deletions(-)
---
diff --git a/isight-firmware-tools.spec b/isight-firmware-tools.spec
index dc9ffa7..a16351b 100644
--- a/isight-firmware-tools.spec
+++ b/isight-firmware-tools.spec
@@ -1,12 +1,14 @@
-#
+# TODO
+# - .spec for buidling -fw package
 Summary:	iSight Firmware Tools
 Name:		isight-firmware-tools
-Version:	1.4.2
+Version:	1.6
 Release:	1
 License:	GPL v2+
 Group:		Applications
-Source0:	http://launchpad.net/isight-firmware-tools/main/1.4/+download/%{name}-%{version}.tar.gz
-# Source0-md5:	9bb964677e722a93dd57e268366556b1
+Source0:	https://launchpad.net/isight-firmware-tools/main/1.6/+download/%{name}-%{version}.tar.gz
+# Source0-md5:	d2823c083dc0ef8a589ba3f84b8e9167
+Patch0:		format-security.patch
 URL:		http://bersace03.free.fr/ift/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,12 +28,13 @@ Requires:	udev-core >= 1:127
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This project provide tools to manipulate firmware for Built-in iSight
-found on Apple machine since iMac G5 iSight.
+A set of tool for firmware extraction from Mac OS X driver and loading
+for use with udev. Use linux-uvc driver to access the isight. Support
+all built-in iSight starting with iMac G5 iSight.
 
 %prep
 %setup -q
-%{__sed} -i -e 's#@udevdir@#/lib/udev#g' src/isight.rules.in.in
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -42,12 +45,18 @@ found on Apple machine since iMac G5 iSight.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	libudevdir=/lib/udev
+	libudevdir=/lib/udev \
+	rulesdir=/lib/udev/rules.d \
+	doc_DATA= \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir
+
+# empty file
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/ift-extract.1
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,14 +72,14 @@ It is usually the file /System/Library/Extensions/IOUSBFamily.kext/Contents/Plug
 EOF
 fi
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README HOWTO AUTHORS ABOUT-NLS
-%attr(755,root,root) %{_bindir}/ift-*
+%doc README HOWTO AUTHORS
+%attr(755,root,root) %{_bindir}/ift-export
+%attr(755,root,root) %{_bindir}/ift-extract
 %attr(755,root,root) /lib/udev/ift-load
-/etc/udev/rules.d/isight.rules
+/lib/udev/rules.d/isight.rules
+%{_mandir}/man1/ift-export.1*
+#%{_mandir}/man1/ift-extract.1*
 %{_infodir}/ift-export.info*
 %{_infodir}/ift-extract.info*
-%{_mandir}/man1/ift-export.1*
-%{_mandir}/man1/ift-extract.1*
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..7c3aa33
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,36 @@
+--- isight-firmware-tools-1.6/src/export.c~	2011-05-01 20:17:49.000000000 +0300
++++ isight-firmware-tools-1.6/src/export.c	2013-02-06 20:05:27.217156441 +0200
+@@ -202,8 +202,7 @@
+ 	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ 		fprintf(stderr, _("Error: %s\n"),
+ 			error->message); /* comment traduire ? */
+-		fprintf(stderr, g_option_context_get_help(context,
+-							  FALSE, NULL));
++		fputs(g_option_context_get_help(context, FALSE, NULL), stderr);
+ 	}
+ 
+ 	if (g_access(input, R_OK)) {
+--- isight-firmware-tools-1.4.2/src/udev.c~	2008-11-04 23:29:06.000000000 +0200
++++ isight-firmware-tools-1.4.2/src/udev.c	2013-02-06 20:15:42.848805902 +0200
+@@ -91,8 +91,7 @@
+ 	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ 		fprintf(stderr, _("Error: %s\n"),
+ 			error->message); /* comment traduire ? */
+-		fprintf(stderr, g_option_context_get_help(context,
+-							  FALSE, NULL));
++		fputs(g_option_context_get_help(context, FALSE, NULL), stderr);
+ 	}
+ 
+ 	if (g_access(firmware, R_OK)) {
+--- isight-firmware-tools-1.6/src/extract.c~	2011-05-01 20:17:49.000000000 +0300
++++ isight-firmware-tools-1.6/src/extract.c	2013-02-06 20:18:34.486700428 +0200
+@@ -362,8 +362,7 @@
+ 	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+ 		fprintf(stderr, _("Error: %s\n"),
+ 			error->message); /* howto translate? */
+-		fprintf(stderr, g_option_context_get_help(context,
+-							  FALSE, NULL));
++		fputs(g_option_context_get_help(context, FALSE, NULL), stderr);
+ 		return 1;
+ 	}
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/isight-firmware-tools.git/commitdiff/273e3f8999bcf0a63f2674f12a00cb0ea28d972d