diff --git a/.cvsignore b/.cvsignore index 13db8e3..89f7549 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pilot-link-0.12.3.tar.bz2 +pilot-link-0.12.4.tar.bz2 diff --git a/bluetooth-session-register.diff b/bluetooth-session-register.diff deleted file mode 100644 index 424cd1c..0000000 --- a/bluetooth-session-register.diff +++ /dev/null @@ -1,71 +0,0 @@ -? bluetooth-session-register.diff -? cscope.out -? pilot-link-0.12.0.tar.gz -? bindings/Python/setup-standalone.py -? src/pilot-csd -? src/pilot-debugsh -? src/pilot-dlpsh -? src/pilot-foto-treo600 -? src/pilot-foto-treo650 -? src/pilot-getram -? src/pilot-getrom -? src/pilot-getromtoken -? src/pilot-hinotes -? src/pilot-install-datebook -? src/pilot-install-expenses -? src/pilot-install-hinote -? src/pilot-install-memo -? src/pilot-install-netsync -? src/pilot-install-todo -? src/pilot-install-todos -? src/pilot-install-user -? src/pilot-memos -? src/pilot-nredir -? src/pilot-read-expenses -? src/pilot-read-ical -? src/pilot-read-notepad -? src/pilot-read-palmpix -? src/pilot-read-screenshot -? src/pilot-read-todos -? src/pilot-read-veo -? src/pilot-reminders -Index: libpisock/bluetooth.c -=================================================================== -RCS file: /cvs/pilot-link/pilot-link_src/libpisock/bluetooth.c,v -retrieving revision 1.3 -diff -a -u -p -r1.3 bluetooth.c ---- libpisock/bluetooth.c 8 Feb 2007 17:08:52 -0000 1.3 -+++ libpisock/bluetooth.c 28 Dec 2007 12:31:24 -0000 -@@ -167,19 +167,19 @@ add_hotsync(sdp_session_t *session, - } - - static int --register_sdp (uint32_t *handle, int *channel, sdp_session_t *sess) -+register_sdp (uint32_t *handle, int *channel, sdp_session_t **sess) - { - svc_info_t si; - bdaddr_t interface; - - bacpy (&interface, BDADDR_ANY); -- sess = sdp_connect (&interface, BDADDR_LOCAL, 0); -+ *sess = sdp_connect (&interface, BDADDR_LOCAL, 0); - -- if (!sess) -+ if (*sess == NULL) - return -1; - memset (&si, 0, sizeof(si)); - si.name = "HOTSYNC"; -- return add_hotsync (sess, 0, &interface, &si, handle, channel); -+ return add_hotsync (*sess, 0, &interface, &si, handle, channel); - } - - static int -@@ -325,7 +325,7 @@ pi_bluetooth_protocol (pi_device_t *dev) - static void - pi_bluetooth_register_hotsync_sdp (struct pi_bluetooth_data *data) - { -- if (register_sdp (&data->handle, &data->channel, data->sess) < 0) { -+ if (register_sdp (&data->handle, &data->channel, &data->sess) < 0) { - data->channel = -1; - data->handle = 0; - data->sess = NULL; diff --git a/pilot-link-0.12.2-Zire.patch b/pilot-link-0.12.2-Zire.patch deleted file mode 100644 index 9019fae..0000000 --- a/pilot-link-0.12.2-Zire.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up pilot-link-0.12.2/libpisock/usb.c.pom pilot-link-0.12.2/libpisock/usb.c ---- pilot-link-0.12.2/libpisock/usb.c.pom 2008-02-07 15:03:58.000000000 +0100 -+++ pilot-link-0.12.2/libpisock/usb.c 2008-02-07 15:02:51.000000000 +0100 -@@ -810,7 +810,8 @@ pi_usb_dev_t known_devices[] = { - { - .vendor = 0x0830, - .product = 0x0061, -+ .idstr = "Zire 31, 72, Z22", -+ .flags = USB_INIT_TAPWAVE, -- .idstr = "Zire 31, 72", - }, - - { diff --git a/pilot-link-0.12.3-clio.patch b/pilot-link-0.12.3-clio.patch index 71f9673..a752c43 100644 --- a/pilot-link-0.12.3-clio.patch +++ b/pilot-link-0.12.3-clio.patch @@ -1,6 +1,6 @@ -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 +diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.c +--- pilot-link-0.12.4/libpisock/usb.c.clio 2009-05-28 14:55:43.000000000 +0200 ++++ pilot-link-0.12.4/libpisock/usb.c 2009-05-28 14:56:57.000000000 +0200 @@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = { .vendor = 0x054c, .product = 0x0066, @@ -9,11 +9,3 @@ diff -up pilot-link-0.12.3/libpisock/usb.c.clio pilot-link-0.12.3/libpisock/usb. }, { -@@ -698,6 +699,7 @@ pi_usb_dev_t known_devices[] = { - .vendor = 0x054c, - .product = 0x0169, - .idstr = "Sony TJ", -+ .flags = USB_INIT_SONY_CLIE, - }, - - /* AlphaSmart */ diff --git a/pilot-link-0.12.3-md5.patch b/pilot-link-0.12.3-md5.patch deleted file mode 100644 index a1bebb5..0000000 --- a/pilot-link-0.12.3-md5.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up pilot-link-0.12.3/include/pi-md5.h.md5 pilot-link-0.12.3/include/pi-md5.h ---- pilot-link-0.12.3/include/pi-md5.h.md5 2006-10-17 15:24:07.000000000 +0200 -+++ pilot-link-0.12.3/include/pi-md5.h 2007-12-11 08:47:56.000000000 +0100 -@@ -13,8 +13,10 @@ - #ifndef MD5_H - #define MD5_H - -+#include -+ - #define UINT8 unsigned char --#define UINT32 unsigned long -+#define UINT32 uint32_t - - struct MD5Context { - UINT32 buf[4]; diff --git a/pilot-link.spec b/pilot-link.spec index d33b808..61ac924 100644 --- a/pilot-link.spec +++ b/pilot-link.spec @@ -1,8 +1,8 @@ %define perl_version %(eval "`%{__perl} -V:version`"; echo $version) Name: pilot-link -Version: 0.12.3 -Release: 20%{?dist} +Version: 0.12.4 +Release: 1%{?dist} Epoch: 2 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL Group: Applications/Communications @@ -20,9 +20,6 @@ ExcludeArch: s390 s390x #Patch3: pilot-link-0.11.2-malsync.patch # May be still applied Patch4: pilot-link-0.12.1-var.patch 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 @@ -77,9 +74,6 @@ This package contains utilities that depend on perl %setup -q %patch4 -p1 -b .var %patch6 -p1 -b .open -%patch7 -p1 -b .md5 -%patch8 -p0 -b .bluetooth-sdp -%patch9 -p1 -b .Zire %patch10 -p1 -b .clio iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux mv doc/README.usb.aux doc/README.usb @@ -185,6 +179,10 @@ rm -rf %{buildroot} %changelog +* Thu May 28 2009 Ivana Varekova - 2:0.12.4-1 +- update to 0.12.4 +- remove obsolete patches + * Wed Apr 15 2009 Ivana Varekova - 2:0.12.3-20 - rename blacklist-visor to blacklist-visor.conf (#494765) diff --git a/sources b/sources index 73a4ead..3478188 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -257124484d50552679c53cae8e118aa3 pilot-link-0.12.3.tar.bz2 +a62baf6fd709c6a3d93077abda936e7a pilot-link-0.12.4.tar.bz2