From 752578ea627a6928d30d705d0b9f2f3df914dd59 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mar 17 2010 14:26:13 +0000 Subject: fix broken bookmarks, resolve bz 463006 --- diff --git a/gftp-2.0.19-fix-broken-bookmarks.patch b/gftp-2.0.19-fix-broken-bookmarks.patch new file mode 100644 index 0000000..ad5abc0 --- /dev/null +++ b/gftp-2.0.19-fix-broken-bookmarks.patch @@ -0,0 +1,188 @@ +diff -up gftp-2.0.19/docs/sample.gftp/bookmarks.BAD gftp-2.0.19/docs/sample.gftp/bookmarks +--- gftp-2.0.19/docs/sample.gftp/bookmarks.BAD 2010-03-17 10:07:40.366848590 -0400 ++++ gftp-2.0.19/docs/sample.gftp/bookmarks 2010-03-17 10:16:41.584837694 -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/fedora/linux + local directory= + username=anonymous + password=@EMAIL@ +@@ -132,16 +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 +@@ -152,16 +132,6 @@ 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 +@@ -282,37 +252,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 +@@ -322,17 +262,7 @@ username=anonymous + password=@EMAIL@ + account= + +-[RedHat Sites/RH Rawhide] +-hostname=rawhide.redhat.com +-port=21 +-protocol=FTP +-remote directory=/ +-local directory= +-username=anonymous +-password=@EMAIL@ +-account= +- +-[RedHat Sites/RH Updates] ++[Red Hat Sites/RH Updates] + hostname=updates.redhat.com + port=21 + protocol=FTP +@@ -342,17 +272,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 +@@ -372,16 +292,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 +@@ -402,11 +312,11 @@ username=anonymous + password=@EMAIL@ + account= + +-[SuSE Sites/SuSE Update] +-hostname=ftp.suse.com ++[SuSE Sites/OpenSuSE Update] ++hostname=ftp.hosteurope.de + port=21 + protocol=FTP +-remote directory=/suse_update ++remote directory=/mirror/ftp.opensuse.org/update + local directory= + username=anonymous + password=@EMAIL@ +@@ -452,16 +362,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 diff --git a/gftp.spec b/gftp.spec index 15f90dc..9d72961 100644 --- a/gftp.spec +++ b/gftp.spec @@ -1,7 +1,7 @@ Summary: A multi-threaded FTP client for the X Window System Name: gftp Version: 2.0.19 -Release: 1%{?dist} +Release: 4%{?dist} Epoch: 2 License: GPLv2+ Group: Applications/Internet @@ -9,6 +9,7 @@ Url: http://gftp.seul.org/ Source0: http://gftp.seul.org/%{name}-%{version}.tar.bz2 Source1: gftp-text-disabled.sh Patch0: gftp-stropts.patch +Patch1: gftp-2.0.19-fix-broken-bookmarks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: readline-devel @@ -29,6 +30,7 @@ Install gftp if you need a graphical FTP client. %prep %setup -q %patch0 -p1 -b .stropts +%patch1 -p1 -b .fix-broken-bookmarks %build %configure @@ -70,6 +72,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/gftp.1.gz %changelog +* Wed Mar 17 2010 Tom "spot" Callaway - 2:2.0.19-4 +- fix broken bookmarks (bz 463006) + +* Fri Aug 21 2009 Tomas Mraz - 2:2.0.19-3 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 2:2.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Mar 01 2009 Itamar Reis Peixoto - 2:2.0.19-1 - upgrade to 2.0.19 - spec cleanup