rpms/openct/devel openct-disable-cardman.patch, 1.1, 1.2 openct.spec, 1.1, 1.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9023

Modified Files:
	openct-disable-cardman.patch openct.spec 
Log Message:
Comment out CardMan 3121 in default config; ccid works better with it and we
don't want openct to get in the way.


openct-disable-cardman.patch:

Index: openct-disable-cardman.patch
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct-disable-cardman.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openct-disable-cardman.patch	1 Feb 2005 21:24:42 -0000	1.1
+++ openct-disable-cardman.patch	25 Feb 2005 20:24:55 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naru openct-0.6.2.orig/etc/Info.plist openct-0.6.2/etc/Info.plist
 --- openct-0.6.2.orig/etc/Info.plist	2004-08-31 23:44:12.000000000 +0300
-+++ openct-0.6.2/etc/Info.plist	2005-02-01 22:21:41.645358832 +0200
++++ openct-0.6.2/etc/Info.plist	2005-02-22 21:29:58.460039475 +0200
 @@ -12,18 +12,18 @@
  
  	<key>ifdVendorID</key>
@@ -25,7 +25,7 @@
  	</array>
 diff -Naru openct-0.6.2.orig/etc/openct.conf.in openct-0.6.2/etc/openct.conf.in
 --- openct-0.6.2.orig/etc/openct.conf.in	2004-06-29 01:44:10.000000000 +0300
-+++ openct-0.6.2/etc/openct.conf.in	2005-02-01 22:39:25.218859061 +0200
++++ openct-0.6.2/etc/openct.conf.in	2005-02-22 21:30:14.812993194 +0200
 @@ -54,9 +54,9 @@
  };
  driver	cardman {
@@ -39,9 +39,18 @@
  	};
  };
  driver	ccid {
+@@ -67,7 +67,7 @@
+ 		usb:04e6/5115,
+ 		usb:04e6/E001,
+ 		usb:04e6/E003,
+-		usb:076b/3021,
++#		usb:076b/3021,
+ 		usb:0783/0003,
+ 	};
+ };
 diff -Naru openct-0.6.2.orig/etc/openct.usermap openct-0.6.2/etc/openct.usermap
 --- openct-0.6.2.orig/etc/openct.usermap	2004-07-10 00:12:16.000000000 +0300
-+++ openct-0.6.2/etc/openct.usermap	2005-02-01 22:18:13.399631957 +0200
++++ openct-0.6.2/etc/openct.usermap	2005-02-22 21:29:58.461039166 +0200
 @@ -12,8 +12,8 @@
  # ikey3k
  openct		     0x0003      0x04b9   0x1300    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openct.spec	1 Feb 2005 21:24:42 -0000	1.1
+++ openct.spec	25 Feb 2005 20:24:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           openct
 Version:        0.6.2
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        Middleware framework for smart card terminals
 
@@ -146,6 +146,10 @@
 
 
 %changelog
+* Tue Feb 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.2-2
+- Comment out CardMan 3121 (CCID) in default config too, the "ccid" driver
+  package works a lot better with it.
+
 * Tue Feb  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.2-1
 - Disable CardMan driver in default configs, too unreliable at the moment.