rpms/gnome-pilot/FC-4 gnome-pilot.spec,1.30,1.31

[fedora-cvs-commits at redhat.com]

Author: than

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

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-4/gnome-pilot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-pilot.spec	30 Jun 2005 23:00:51 -0000	1.30
+++ gnome-pilot.spec	12 Apr 2006 15:26:51 -0000	1.31
@@ -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: 5.fc4
+Release: 5.fc4.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -13,18 +13,18 @@
 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}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: pilot-link >= %{pilot_link_version}
 Prereq: scrollkeeper
 Prereq: GConf2
 BuildRequires: libgnome-devel >= 2.0.0
@@ -35,7 +35,7 @@
 BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gnome-panel-devel >= 2.0.6
 BuildRequires: GConf2-devel >= 2.0
-BuildRequires: pilot-link-devel >= %{pilot-link-version}
+BuildRequires: pilot-link-devel >= %{pilot_link_version}
 ExcludeArch: s390 s390x
 
 %description
@@ -46,7 +46,7 @@
 Summary: GNOME pilot libraries, includes, etc
 Group: Development/Libraries
 Requires: ORBit2-devel
-Requires: pilot-link-devel >= %{pilot-link-version}
+Requires: pilot-link-devel >= %{pilot_link_version}
 Requires: %name = %{version}
 Requires: libgnomeui-devel
 
@@ -60,15 +60,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
@@ -148,6 +151,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 12 2006 Than Ngo <than at redhat.com> 2.0.13-5.fc4.1
+- rebuilt against pilot-link-0.11.8
+
 * Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc4
 - Regenerate patch 18 with a fix for a crash in the backup conduit (would crash whenever no modifications had occurred since the last sync)
 - Fixed gnome-pilot-2.0.12-move-conduits-autotools.patch to set GNOME_PILOT_CONDUIT_SEARCH_PATH to libdir/gnome-pilot/conduits