dist-git conversion

#2781)

60-pilot.rules

@@ -1 +0,0 @@
-BUS=="usb", SYSFS{product}=="Palm Handheld*|Handspring*",KERNEL=="ttyUSB[13579]", SYMLINK="pilot", GROUP="uucp", MODE="0660"

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: pilot-link
-# $Id: Makefile,v 1.1 2004/09/09 10:27:02 cvsdist Exp $
-NAME := pilot-link
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

README.fedora

@@ -39,19 +39,30 @@ Unfortunately this solution is inherently imperfect when used with udev
 1) disable libusb: remove (or comment out the contents) of
 /etc/modprobe.d/blacklist-visor
 
-2) Configure udev to detect the Palm and create /dev/pilot: copy
-60-pilot.rules from /usr/share/pilot-link/udev/ to /etc/udev/rules.d/
+2) Configure udev to detect the Palm:
+2a) copy 60-libpisock.rules from /usr/share/pilot-link/udev/ to 
+/etc/udev/rules.d/
+2b) within 60-libpisock.rules change all instances of GROUP="dialout" to
+GROUP="uucp"
 
 3) Configure permissions so that a console user can access /dev/pilot:
 copy 60-pilot.perms from /usr/share/pilot-link/udev/ to
 /etc/security/console.perms.d/
 
-If your palm is not working you could try to change the symlink 
-created in 60-pilot.rules - change the tag KERNEL=="ttyUSB[13579]" to
-KERNEL=="ttyUSB[02468]".
+When you connect your Palm handheld, watch /var/log/messages - the visor
+module should create two ttyUSB devices. Depending on your handheld
+model you will need to use either the first or second of these as the
+--port argument with pilot-link based programs.
 
-For a discussion of the inherent problems related to the Visor module,
-see:
+Some users like the convenience of linking this device to /dev/pilot.
+To do this add SYMLINK="pilot" and one of either KERNEL=="ttyUSB[02468]"
+or KERNEL=="ttyUSB[13579]" to each line in 60-libpisock.rules, depending
+on whether you need to use the first or second visor ttyUSB device.
+N.B. This is inherently unreliable since another driver could create an
+odd number of ttyUSB devices before the /dev/pilot symlink is created.
+
+For further discussion of the inherent problems related to the Visor 
+module, see:
 https://bugzilla.redhat.com/show_bug.cgi?id=158809
 
 

pilot-link-0.12.3-clio.patch

@@ -0,0 +1,19 @@
+diff -up pilot-link-0.12.3/libpisock/usb.c.clio pilot-link-0.12.3/libpisock/usb.c
+--- pilot-link-0.12.3/libpisock/usb.c.clio	2008-09-19 12:06:52.000000000 +0200
++++ pilot-link-0.12.3/libpisock/usb.c	2008-09-23 10:57:22.000000000 +0200
+@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
+ 		.vendor 	= 0x054c,
+ 		.product 	= 0x0066,
+ 		.idstr 		= "Sony T, SJ series, and other Palm OS 4.0 devices",
++		.flags      = USB_INIT_SONY_CLIE,
+ 	},
+ 
+ 	{
+@@ -698,6 +699,7 @@ pi_usb_dev_t known_devices[] = {
+ 		.vendor 	= 0x054c,
+ 		.product 	= 0x0169,
+ 		.idstr 		= "Sony TJ",
++		.flags 		= USB_INIT_SONY_CLIE,
+ 	},
+ 
+ 	/* AlphaSmart */

pilot-link.spec

@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.3
-Release: 13%{?dist}
+Release: 16%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -14,7 +14,6 @@ Source0: pilot-link-%{version}.tar.bz2
 Source3: blacklist-visor
 Source4: README.fedora
 Source5: 60-pilot.perms
-Source6: 60-pilot.rules
 
 ExcludeArch: s390 s390x
 #Patch1: pilot-link-0.11.0-perlmd5.patch  # May be still applied
@@ -25,6 +24,7 @@ Patch6: pilot-link-0.12.2-open.patch
 Patch7: pilot-link-0.12.3-md5.patch
 Patch8: bluetooth-session-register.diff
 Patch9: pilot-link-0.12.2-Zire.patch
+Patch10: pilot-link-0.12.3-clio.patch
 
 
 Requires(post): /sbin/ldconfig
@@ -82,6 +82,7 @@ need to install pilot-link-devel.
 %patch7 -p1 -b .md5
 %patch8 -p0 -b .bluetooth-sdp
 %patch9 -p1 -b .Zire
+%patch10 -p1 -b .clio
 
 %build
 autoreconf -is
@@ -151,7 +152,6 @@ cp %{SOURCE4} README.fedora
 
 # install visor configs to share/udev
 install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev
-install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev
 
 %post -p /sbin/ldconfig
 
@@ -181,6 +181,15 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Sep 23 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-16
+- extend clio patch - thanks Kevin R. Page
+
+* Fri Sep 19 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-15
+- add clio patch (454178) - thanks Michael Ekstrand
+
+* Fri Jun 06 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.3-14
+- corrected documentation for visor module use
+
 * Wed Mar 26 2008 Ivana Varekova <varekova@redhat.com> 2:0.12.3-13
 - remove HAL/PolicyKit staff (is in hal package now)