rpms/gftp/devel gftp-2.0.18-bookmarks-cleanups.patch, NONE, 1.1 gftp.spec, 1.31, 1.32

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/gftp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14803

Modified Files:
	gftp.spec 
Added Files:
	gftp-2.0.18-bookmarks-cleanups.patch 
Log Message:
cleanup bookmarks

gftp-2.0.18-bookmarks-cleanups.patch:

--- NEW FILE gftp-2.0.18-bookmarks-cleanups.patch ---
diff -up gftp-2.0.18/docs/sample.gftp/bookmarks.BAD gftp-2.0.18/docs/sample.gftp/bookmarks
--- gftp-2.0.18/docs/sample.gftp/bookmarks.BAD	2008-10-27 09:43:18.000000000 -0400
+++ gftp-2.0.18/docs/sample.gftp/bookmarks	2008-10-27 09:49:47.000000000 -0400
@@ -42,21 +42,11 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[Debian Sites/Debian non-US]
-hostname=non-us.debian.org
+[Fedora Sites/Fedora]
+hostname=download.fedora.redhat.com
 port=21
 protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Debian Sites/Freshmeat DEBs]
-hostname=ftp.freshmeat.net
-port=21
-protocol=FTP
-remote directory=/pub/debs
+remote directory=/pub
 local directory=
 username=anonymous
 password=@EMAIL@
@@ -132,36 +122,6 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[General Sites/Source Forge]
-hostname=ftp.sourceforge.net
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Tux.Org]
-hostname=ftp.tux.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/TSX-11]
-hostname=tsx-11.mit.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [General Sites/Wcarchive]
 hostname=ftp.cdrom.com
 port=21
@@ -172,37 +132,7 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[RedHat Sites/FalseHope RPMs]
-hostname=ftp.falsehope.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/Freshmeat RPMs]
-hostname=ftp.freshmeat.net
-port=21
-protocol=FTP
-remote directory=/pub/rpms
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Contrib]
-hostname=contrib.redhat.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Main]
+[Red Hat Sites/RH Main]
 hostname=ftp.redhat.com
 port=21
 protocol=FTP
@@ -212,7 +142,7 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[RedHat Sites/RH Rawhide]
+[Red Hat Sites/RH Rawhide]
 hostname=rawhide.redhat.com
 port=21
 protocol=FTP
@@ -222,7 +152,7 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[RedHat Sites/RH Updates]
+[Red Hat Sites/RH Updates]
 hostname=updates.redhat.com
 port=21
 protocol=FTP
@@ -232,17 +162,7 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[RedHat Sites/RPM.org]
-hostname=ftp.rpm.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/Fresh RPMS]
+[Red Hat Sites/Fresh RPMS]
 hostname=ftp.freshrpms.net
 port=21
 protocol=FTP
@@ -262,16 +182,6 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[Slackware Sites/linuxmafia.org]
-hostname=packages.linuxmafia.org
-port=21
-protocol=FTP
-remote directory=/pub/slackware-7.0
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [SuSE Sites/SuSE]
 hostname=ftp.suse.com
 port=21
@@ -292,8 +202,8 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[SuSE Sites/SuSE Update]
-hostname=ftp.suse.com
+[SuSE Sites/OpenSuSE Update]
+hostname=ftp.hosteurope.de/mirror/ftp.opensuse.org/
 port=21
 protocol=FTP
 remote directory=/suse_update
@@ -342,16 +252,6 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/LessTif]
-hostname=ftp.hungry.com
-port=21
-protocol=FTP
-remote directory=/pub/hungry/lesstif
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
 [X11 Sites/Qt]
 hostname=ftp.troll.no
 port=21


Index: gftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gftp.spec	2 Apr 2008 20:30:42 -0000	1.31
+++ gftp.spec	27 Oct 2008 13:55:25 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A multi-threaded FTP client for the X Window System
 Name: gftp
 Version: 2.0.18
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 2
 License: GPLv2+
 Group: Applications/Internet
@@ -11,6 +11,7 @@
 Patch0: gftp-2.0.18-thread-initialization.patch
 Patch1: gftp-2.0.18-user-dirs.patch
 Patch2: gftp-stropts.patch
+Patch3: gftp-2.0.18-bookmarks-cleanups.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= 2.2.0
 BuildRequires: readline-devel
@@ -33,6 +34,7 @@
 %patch0 -p1 -b .thread-initialization
 %patch1 -p1 -b .user-dirs
 %patch2 -p1 -b .stropts
+%patch3 -p1 -b .fixbookmarks
 
 %build
 
@@ -80,6 +82,9 @@
 %{_mandir}/man1/gftp.1.gz
 
 %changelog
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2:2.0.18-4
+- fix bookmarks (bz 463006)
+
 * Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> - 2:2.0.18-3
 - stropts.h was removed from glibc; don't #include it anymore