Mon Nov 13 16:44:43 UTC 2006

Author: mbarnes

Update of /cvs/dist/rpms/gnome-pilot/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv16951

Modified Files:
	.cvsignore gnome-pilot.spec sources 
Added Files:
	gnome-pilot-2.0.14-fix-conduit-dir.patch 
	gnome-pilot-2.0.14-sleep.patch 
Removed Files:
	gb-309077-attach-48373-fix-xml-properties-leak.patch 
	gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch 
	gnome-pilot-2.0.10-fix_64bit.patch 
	gnome-pilot-2.0.11-fixsync.patch 
	gnome-pilot-2.0.12-defines.patch 
	gnome-pilot-2.0.12-desktop.patch 
	gnome-pilot-2.0.12-disable_backup_conduit.patch 
	gnome-pilot-2.0.12-fix_icon.patch 
	gnome-pilot-2.0.12-fix_warnings.patch 
	gnome-pilot-2.0.12-libtool.patch 
	gnome-pilot-2.0.12-move-conduits-autotools.patch 
	gnome-pilot-2.0.12-move-conduits-code.patch 
	gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch 
	gnome-pilot-2.0.13-include-pi-error.patch 
	gnome-pilot-2.0.13-sleep-after-sync.patch 
	gnome-pilot-2.0.13-slist-remove.patch 
	rh-161799-attach-116013-backup_conduit_update.diff 
	rh-161799-attach-116014-conduits_64bit.diff 
Log Message:

* Mon Nov 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.14-1.fc6
- Update to 2.0.14
- Add patch for Gnome.org bug #362565 (sleep before syncing).
- Remove unused patches.
- Remove patches fixed upstream:
	gnome-pilot-2.0.10-fix_64bit.patch
	gnome-pilot-2.0.12-fix_icon.patch
	gnome-pilot-2.0.12-defines.patch
	gnome-pilot-2.0.12-move-conduits-code.patch
	gnome-pilot-2.0.12-move-conduits-autotools.patch
        gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
        gb-309077-attach-48373-fix-xml-properties-leak.patch
        gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
        rh-161799-attach-116013-backup_conduit_update.diff
        rh-161799-attach-116014-conduits_64bit.diff
- Add missing BuildRequires intltool.
- Remove BuildRequires autoconf, automake (no longer needed).


gnome-pilot-2.0.14-fix-conduit-dir.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-pilot-2.0.14-fix-conduit-dir.patch ---
--- gnome-pilot-2.0.14/libgpilotdCM/Makefile.am.fix-conduit-dir	2006-11-06 16:50:34.000000000 -0500
+++ gnome-pilot-2.0.14/libgpilotdCM/Makefile.am	2006-11-06 16:51:17.000000000 -0500
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/libgpilotdCM 		\
 	-DG_LOG_DOMAIN=\"libgpilotdcm\" 	\
 	$(GNOME_PILOT_CFLAGS)			\
-	-DCONDUITDIR=\"$(datadir)\"
+	-DCONDUITDIR=\"$(libdir)\"
 
 GOB_BUILT_SRCS = 					\
 	gnome-pilot-conduit-management.c 		\
--- gnome-pilot-2.0.14/libgpilotdCM/Makefile.in.fix-conduit-dir	2006-11-06 16:50:41.000000000 -0500
+++ gnome-pilot-2.0.14/libgpilotdCM/Makefile.in	2006-11-06 16:51:06.000000000 -0500
@@ -217,7 +217,7 @@
 	-I$(top_srcdir)/libgpilotdCM 		\
 	-DG_LOG_DOMAIN=\"libgpilotdcm\" 	\
 	$(GNOME_PILOT_CFLAGS)			\
-	-DCONDUITDIR=\"$(datadir)\"
+	-DCONDUITDIR=\"$(libdir)\"
 
 
 GOB_BUILT_SRCS = \

gnome-pilot-2.0.14-sleep.patch:
 gpilotd.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE gnome-pilot-2.0.14-sleep.patch ---
--- gnome-pilot-2.0.14/gpilotd/gpilotd.c.sleep	2006-09-05 03:16:41.000000000 -0400
+++ gnome-pilot-2.0.14/gpilotd/gpilotd.c	2006-11-05 08:05:07.000000000 -0500
@@ -1088,6 +1088,11 @@
 			/* just try to sync.  Until I can talk to 
 			 * the kernel guys this is the best way to 
 			 * go. */
+			/* HACK: add a short delay prior to sync attempt,
+			 * hoping to fix some timing issues.  See
+			 * bug #362565 on bugzilla.gnome.org
+			 */
+			usleep(device->timeout * 100000);
 			sync_device (device, context);
 
 			if (!visor_net)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Apr 2005 18:50:24 -0000	1.9
+++ .cvsignore	13 Nov 2006 16:44:40 -0000	1.10
@@ -1 +1 @@
-gnome-pilot-2.0.13.tar.bz2
+gnome-pilot-2.0.14.tar.bz2


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-6/gnome-pilot.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-pilot.spec	10 Aug 2006 18:59:47 -0000	1.46
+++ gnome-pilot.spec	13 Nov 2006 16:44:40 -0000	1.47
@@ -1,11 +1,10 @@
-#%define pilot_link_version 2:0.11.8
 %define pilot_link_version 0.11.8
 
 ### Abstract ###
 
 Name: gnome-pilot
-Version: 2.0.13
-Release: 16
+Version: 2.0.14
+Release: 1%{?dist}
 License: LGPL
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -15,43 +14,28 @@
 
 ### Patches ###
 
-Patch10: gnome-pilot-2.0.10-fix_64bit.patch
-Patch11: gnome-pilot-2.0.12-fix_icon.patch
-Patch12: gnome-pilot-2.0.12-move-conduits-code.patch
-Patch13: gnome-pilot-2.0.12-move-conduits-autotools.patch
-Patch14: gnome-pilot-2.0.12-defines.patch
-
-# This patch has been regenerated by Mark G Adams:
-# patches for pilot-link-0.12
-Patch15: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
-Patch16: gnome-pilot-2.0.13-include-pi-error.patch
-Patch17: rh-161799-attach-116013-backup_conduit_update.diff
-
-# Various patches by Mark G Adams filed in GNOME and RH Bugzilla:
-Patch18: gb-309077-attach-48373-fix-xml-properties-leak.patch
-Patch19: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
-Patch20: rh-161799-attach-116014-conduits_64bit.diff
-
-# RH bug #189294 (2 patches)
-Patch21: gnome-pilot-2.0.13-sleep-after-sync.patch
-Patch22: gnome-pilot-2.0.13-slist-remove.patch
+# Gnome.org bug #362565
+Patch1: gnome-pilot-2.0.14-sleep.patch
+
+# RH bug #135304 (sort of)
+Patch2: gnome-pilot-2.0.14-fix-conduit-dir.patch
 
 ### Dependencies ###
 
 Prereq: GConf2
 Prereq: scrollkeeper
+
 Requires: pilot-link >= %{pilot_link_version}
 
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: ORBit2-devel >= 2.0.0
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gettext
 BuildRequires: gnome-panel-devel >= 2.0.6
 BuildRequires: gob2 >= 2.0.3
+BuildRequires: intltool
 BuildRequires: libbonobo-devel >= 2.0.0
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: libgnome-devel >= 2.0.0
@@ -76,26 +60,11 @@
 
 %prep
 %setup -q
-%patch10 -p1 -b .fix_64bit
-%patch11 -p1 -b .fix_icon
-%patch12 -p1 -b .move-conduits-code
-%patch13 -p1 -b .move-conduits-autotools
-%patch14 -p1 -b .defines
-
-# patches for pilot-link-0.12
-#%patch15 -p0 -b .port-to-pilot-link-0.12
-#%patch16 -p1 -b .include-pi-error
-#%patch17 -p0 -b .backup_conduit_update
-
-%patch18 -p0 -b .fix-xml-properties-leak
-%patch19 -p0 -b .backup-conduit-valgrind-fixes
-%patch20 -p0 -b .conduits_64bit
 
-%patch21 -p1 -b .sleep-after-sync
-%patch22 -p1 -b .slist-remove
+%patch1 -p1 -b .sleep
+%patch2 -p1 -b .fix-conduit-dir
 
 %build
-autoreconf -i
 %configure
 cp %{_bindir}/libtool .
 perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
@@ -109,20 +78,10 @@
 %makeinstall LIBTOOL=%{_bindir}/libtool
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# fixup location of conduits
 mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit \
   $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
 
-# fixup location of desktop file:
-mkdir $RPM_BUILD_ROOT/%{_datadir}/applications/
-mv $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gpilotd-control-applet.desktop \
-  $RPM_BUILD_ROOT/%{_datadir}/applications/
-
-# remove unwanted files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*test_conduit.*
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/test.conduit
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %find_lang %{name}
@@ -175,6 +134,24 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.14-1.fc6
+- Update to 2.0.14
+- Add patch for Gnome.org bug #362565 (sleep before syncing).
+- Remove unused patches.
+- Remove patches fixed upstream:
+	gnome-pilot-2.0.10-fix_64bit.patch
+	gnome-pilot-2.0.12-fix_icon.patch
+	gnome-pilot-2.0.12-defines.patch
+	gnome-pilot-2.0.12-move-conduits-code.patch
+	gnome-pilot-2.0.12-move-conduits-autotools.patch
+        gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
+        gb-309077-attach-48373-fix-xml-properties-leak.patch
+        gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
+        rh-161799-attach-116013-backup_conduit_update.diff
+        rh-161799-attach-116014-conduits_64bit.diff
+- Add missing BuildRequires intltool.
+- Remove BuildRequires autoconf, automake (no longer needed).
+
 * Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.13-16
 - Forgot to commit the new patches.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Apr 2005 18:50:24 -0000	1.9
+++ sources	13 Nov 2006 16:44:40 -0000	1.10
@@ -1 +1 @@
-662aae1d5915e81e64ee1a6c732c627d  gnome-pilot-2.0.13.tar.bz2
+e0dd8c92db7c6df8840e5dcecaea2f3b  gnome-pilot-2.0.14.tar.bz2


--- gb-309077-attach-48373-fix-xml-properties-leak.patch DELETED ---


--- gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch DELETED ---


--- gnome-pilot-2.0.10-fix_64bit.patch DELETED ---


--- gnome-pilot-2.0.11-fixsync.patch DELETED ---


--- gnome-pilot-2.0.12-defines.patch DELETED ---


--- gnome-pilot-2.0.12-desktop.patch DELETED ---


--- gnome-pilot-2.0.12-disable_backup_conduit.patch DELETED ---


--- gnome-pilot-2.0.12-fix_icon.patch DELETED ---


--- gnome-pilot-2.0.12-fix_warnings.patch DELETED ---


--- gnome-pilot-2.0.12-libtool.patch DELETED ---


--- gnome-pilot-2.0.12-move-conduits-autotools.patch DELETED ---


--- gnome-pilot-2.0.12-move-conduits-code.patch DELETED ---


--- gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch DELETED ---


--- gnome-pilot-2.0.13-include-pi-error.patch DELETED ---


--- gnome-pilot-2.0.13-sleep-after-sync.patch DELETED ---


--- gnome-pilot-2.0.13-slist-remove.patch DELETED ---


--- rh-161799-attach-116013-backup_conduit_update.diff DELETED ---


--- rh-161799-attach-116014-conduits_64bit.diff DELETED ---


