rpms/argyllcms/devel argyllcms-1.0.3-remove-libusb-fork-check.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 argyllcms.spec, 1.5, 1.6 import.log, 1.2, 1.3 sources, 1.4, 1.5 argyllcms-0.70-color-device-file.policy, 1.1, NONE argyllcms-1.0.1-19-color.fdi, 1.1, NONE argyllcms-1.0.1-remove-libusb-fork-check.patch, 1.1, NONE

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/argyllcms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9870/devel

Modified Files:
	.cvsignore argyllcms.spec import.log sources 
Added Files:
	argyllcms-1.0.3-remove-libusb-fork-check.patch 
Removed Files:
	argyllcms-0.70-color-device-file.policy 
	argyllcms-1.0.1-19-color.fdi 
	argyllcms-1.0.1-remove-libusb-fork-check.patch 
Log Message:
1.0.3

argyllcms-1.0.3-remove-libusb-fork-check.patch:

--- NEW FILE argyllcms-1.0.3-remove-libusb-fork-check.patch ---
diff -uNr Argyll_V1.0.3.orig/spectro/usbio.c Argyll_V1.0.3/spectro/usbio.c
--- Argyll_V1.0.3.orig/spectro/usbio.c	2008-09-03 02:10:32.000000000 +0200
+++ Argyll_V1.0.3/spectro/usbio.c	2008-09-03 22:27:19.000000000 +0200
@@ -102,9 +102,6 @@
 #ifdef ENABLE_USB
 	struct usb_bus *bus;
 
-	/* Check that we've got an up to date version of libusb */
-	if (usb_argyll_patched() < 2)
-		error("usblib isn't up to date to work with this version of Argyll");
 
 // ~~99
 //	if (p->debug)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Sep 2008 12:28:39 -0000	1.4
+++ .cvsignore	3 Sep 2008 20:59:38 -0000	1.5
@@ -1,2 +1,2 @@
 Argyll_V1.0.1_autotools.patch.gz
-Argyll_V1.0.2_src.zip
+Argyll_V1.0.3_src.zip


Index: argyllcms.spec
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/argyllcms.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- argyllcms.spec	1 Sep 2008 12:28:39 -0000	1.5
+++ argyllcms.spec	3 Sep 2008 20:59:38 -0000	1.6
@@ -4,7 +4,7 @@
 %define archivename Argyll_V%{version}%{?alphaversion}_src.zip
 
 Name:    argyllcms
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?alphatag}%{?dist}
 Summary: ICC compatible color management system
 
@@ -13,11 +13,9 @@
 URL:     http://www.%{name}.com/
 
 Source0: %{url}%{archivename}
-Source1: %{name}-1.0.1-19-color.fdi
-Source2: %{name}-0.70-color-device-file.policy
 # Many thanks to Alastair M. Robinson!
 Patch1:  http://www.blackfiveservices.co.uk/Argyll_V1.0.1_autotools.patch.gz
-Patch2:  %{name}-1.0.1-remove-libusb-fork-check.patch
+Patch2:  %{name}-1.0.3-remove-libusb-fork-check.patch
 # Patch applied for legal reasons
 Patch4:  %{name}-1.0.2-legal.patch
 
@@ -67,6 +65,10 @@
 # Legal patch required
 %patch4 -p1 -b .legal
 
+# Salvage policy files
+mv libusb/19-color.fdi .
+mv libusb/color-device-file.policy .
+
 # Remove useless bundled libs to make sure we don't accidentally include them
 rm -fr tiff libusb libusbw
 
@@ -84,12 +86,12 @@
 
 # Do some device permission magic
 install -d -m 0755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
-install -p -m 0644 %{SOURCE1} \
-        %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi
+install -p -m 0644 19-color.fdi \
+        %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
 
 install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/
-install -p -m 0644 %{SOURCE2} \
-        %{buildroot}%{_datadir}/PolicyKit/policy/color-device-file.policy
+install -p -m 0644 color-device-file.policy \
+        %{buildroot}%{_datadir}/PolicyKit/policy/
 
 
 %clean
@@ -113,6 +115,10 @@
 
 
 %changelog
+* Wed Sep 3 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 1.0.3-1
+⌨ Bugfix release
+
 * Mon Sep 1 2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 1.0.2-1
 á¾¢ Bugfix release


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	1 Sep 2008 12:28:39 -0000	1.2
+++ import.log	3 Sep 2008 20:59:38 -0000	1.3
@@ -1,2 +1,3 @@
 argyllcms-1_0_1-1_fc10_nim:HEAD:argyllcms-1.0.1-1.fc10.nim.src.rpm:1217165503
 argyllcms-1_0_2-1_fc10:HEAD:argyllcms-1.0.2-1.fc10.src.rpm:1220272108
+argyllcms-1_0_3-1_fc10:HEAD:argyllcms-1.0.3-1.fc10.src.rpm:1220475532


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/argyllcms/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Sep 2008 12:28:39 -0000	1.4
+++ sources	3 Sep 2008 20:59:38 -0000	1.5
@@ -1,2 +1,2 @@
 cdb94385421c2fae1cf6fb068069cd9e  Argyll_V1.0.1_autotools.patch.gz
-fd56b470873cbca980a37836adc41095  Argyll_V1.0.2_src.zip
+01915869a2fda1fdaa91174edf57a0c6  Argyll_V1.0.3_src.zip


--- argyllcms-0.70-color-device-file.policy DELETED ---


--- argyllcms-1.0.1-19-color.fdi DELETED ---


--- argyllcms-1.0.1-remove-libusb-fork-check.patch DELETED ---