rpms/gnome-pilot/devel gnome-pilot.spec,1.44,1.45

Thu Aug 10 18:56:04 UTC 2006

Author: mbarnes

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

Modified Files:
	gnome-pilot.spec 
Log Message:
- Add patches for RH bug #189294.



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45

--- gnome-pilot.spec	12 Jul 2006 06:04:23 -0000	1.44
+++ gnome-pilot.spec	10 Aug 2006 18:56:00 -0000	1.45
@@ -1,76 +1,98 @@
-%define pilot_link_version 2:0.11.8
-Summary: GNOME pilot programs
+#%define pilot_link_version 2:0.11.8
+%define pilot_link_version 0.11.8
+
+### Abstract ###
+
 Name: gnome-pilot
 Version: 2.0.13
-Release: 13.1
+Release: 15
 License: LGPL
 Group: Applications/Communications
-Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
-Patch1: gnome-pilot-2.0.10-fix_64bit.patch
-Patch5: gnome-pilot-2.0.12-fix_icon.patch
-Patch7: gnome-pilot-2.0.12-move-conduits-code.patch
-Patch8: gnome-pilot-2.0.12-move-conduits-autotools.patch
-Patch9: gnome-pilot-2.0.12-defines.patch
+Summary: GNOME pilot programs
+Source: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+ExcludeArch: s390 s390x
+
+### 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
-Patch11: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch
-Patch12: gnome-pilot-2.0.13-include-pi-error.patch
-Patch13: rh-161799-attach-116013-backup_conduit_update.diff
+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:
-Patch16: gb-309077-attach-48373-fix-xml-properties-leak.patch
-Patch17: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch
-Patch19: rh-161799-attach-116014-conduits_64bit.diff
+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
+
+### Dependencies ###
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pilot-link >= %{pilot_link_version}
-Prereq: scrollkeeper
 Prereq: GConf2
-BuildRequires: libgnome-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.0
-BuildRequires: libglade2-devel >= 2.0.0
+Prereq: scrollkeeper
+Requires: pilot-link >= %{pilot_link_version}
+
+### Build Dependencies ###
+
+BuildRequires: GConf2-devel >= 2.0
 BuildRequires: ORBit2-devel >= 2.0.0
-BuildRequires: libbonobo-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: GConf2-devel >= 2.0
 BuildRequires: gob2 >= 2.0.3
+BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: libglade2-devel >= 2.0.0
+BuildRequires: libgnome-devel >= 2.0.0
+BuildRequires: libgnomeui-devel >= 2.0.0
+BuildRequires: libtool
 BuildRequires: pilot-link-devel >= %{pilot_link_version}
-BuildRequires: gettext autoconf automake libtool
-ExcludeArch: s390 s390x
 
 %description
 gnome-pilot is a collection of programs and daemon for integrating
 GNOME and the PalmPilot<tm> or other PalmOS<tm> devices.
 
 %package devel
-Summary: GNOME pilot libraries, includes, etc
 Group: Development/Libraries
-Requires: ORBit2-devel
-Requires: pilot-link-devel >= %{pilot_link_version}
+Summary: GNOME pilot libraries, includes, etc
 Requires: %name = %{version}
+Requires: ORBit2-devel
 Requires: libgnomeui-devel
+Requires: pilot-link-devel >= %{pilot_link_version}
 
 %description devel
 gpilotd libraries and includes.
 
 %prep
 %setup -q
-%patch1 -p1 -b .fix_64bit
-%patch5 -p1 -b .fix_icon
-%patch7 -p1 -b .move-conduits-code
-%patch8 -p1 -b .move-conduits-autotools
-%patch9 -p1 -b .defines
+%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
-#%patch11 -p0 -b .port-to-pilot-link-0.12
-#%patch12 -p1 -b .include-pi-error
-#%patch13 -p0 -b .backup_conduit_update
-
-%patch16 -p0 -b .fix-xml-properties-leak
-%patch17 -p0 -b .backup-conduit-valgrind-fixes
-%patch19 -p0 -b .conduits_64bit
+#%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
 
 %build
 autoreconf -i
@@ -88,11 +110,13 @@
 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/
+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/
+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
@@ -151,6 +175,12 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Aug 10 2006 Matthew Barnes <mbarnes at redhat.com> - 2.0.13-15
+- Add patches for RH bug #189294.
+
+* Mon Jul 31 2006 Matthew Barnes <mbarnes at redhat.com> 2.0.13-14
+- Cleanup spec file, renumber patches.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-13.1
 - rebuild
 


