rpms/gnome-pilot/FC-5 gnome-pilot.spec,1.36,1.37

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	gnome-pilot.spec 
Log Message:
rebuilt against pilot-link-0.11.8




Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-5/gnome-pilot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-pilot.spec	11 Mar 2006 07:55:13 -0000	1.36
+++ gnome-pilot.spec	11 Apr 2006 13:01:46 -0000	1.37
@@ -1,8 +1,8 @@
-%define pilot_link_version 1:0.12.0-0.pre2.0
+%define pilot_link_version 2:0.11.8
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.4
+Release: 7.fc5.5
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -13,16 +13,16 @@
 Patch9: 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
 
 # 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
-Patch18: rh-161799-attach-116013-backup_conduit_update.diff
 Patch19: rh-161799-attach-116014-conduits_64bit.diff
 
-Patch20: gnome-pilot-2.0.13-include-pi-error.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: pilot-link >= %{pilot_link_version}
 Prereq: scrollkeeper
@@ -61,15 +61,18 @@
 %patch7 -p1 -b .move-conduits-code
 %patch8 -p1 -b .move-conduits-autotools
 %patch9 -p1 -b .defines
+
+# patches for pilot-link-0.12
+%if 0
 %patch11 -p0 -b .port-to-pilot-link-0.12
+%patch12 -p1 -b .include-pi-error
+%patch13 -p0 -b .backup_conduit_update
+%endif
 
 %patch16 -p0 -b .fix-xml-properties-leak
 %patch17 -p0 -b .backup-conduit-valgrind-fixes
-%patch18 -p0 -b .backup_conduit_update
 %patch19 -p0 -b .conduits_64bit
 
-%patch20 -p1 -b .include-pi-error
-
 %build
 autoreconf -i
 %configure
@@ -149,6 +152,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 2.0.13-7.fc5.5
+- rebuilt against pilot-link-0.11.8
+
 * Sat Mar 11 2006 Bill Nottingham <notting at redhat.com> 2.0.13-7.fc5.4
 - fix pilot-link-version vs pilot_link_version macro/dep confusion