rpms/gftp/devel import.log, NONE, 1.1 .cvsignore, 1.9, 1.10 gftp-stropts.patch, 1.1, 1.2 gftp.spec, 1.34, 1.35 sources, 1.9, 1.10 gftp-2.0.18-bookmarks-cleanups.patch, 1.1, NONE gftp-2.0.18-thread-initialization.patch, 1.1, NONE gftp-2.0.18-user-dirs.patch, 1.1, NONE

[Itamar Reis Peixoto]

Author: itamarjp

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

Modified Files:
	.cvsignore gftp-stropts.patch gftp.spec sources 
Added Files:
	import.log 
Removed Files:
	gftp-2.0.18-bookmarks-cleanups.patch 
	gftp-2.0.18-thread-initialization.patch 
	gftp-2.0.18-user-dirs.patch 
Log Message:
upgrade to 2.0.19



--- NEW FILE import.log ---
gftp-2_0_19-1_fc11:HEAD:gftp-2.0.19-1.fc11.src.rpm:1235931310


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Feb 2005 04:26:45 -0000	1.9
+++ .cvsignore	1 Mar 2009 18:16:43 -0000	1.10
@@ -1,2 +1 @@
-gftp-2.0.17.tar.bz2
-gftp-2.0.18.tar.bz2
+gftp-2.0.19.tar.bz2

gftp-stropts.patch:

Index: gftp-stropts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/gftp-stropts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gftp-stropts.patch	2 Apr 2008 20:30:42 -0000	1.1
+++ gftp-stropts.patch	1 Mar 2009 18:16:43 -0000	1.2
@@ -1,14 +1,12 @@
-diff -up gftp-2.0.18/lib/pty.c.stropts gftp-2.0.18/lib/pty.c
---- gftp-2.0.18/lib/pty.c.stropts	2008-04-02 16:22:00.000000000 -0400
-+++ gftp-2.0.18/lib/pty.c	2008-04-02 16:22:45.000000000 -0400
-@@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char 
+diff -ruNp gftp-2.0.19.old/lib/pty.c gftp-2.0.19.new/lib/pty.c
+--- gftp-2.0.19.old/lib/pty.c	2007-03-12 22:56:43.000000000 -0300
++++ gftp-2.0.19.new/lib/pty.c	2009-03-01 10:54:39.000000000 -0300
+@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char 
  
  #elif HAVE_GRANTPT
  
--#ifndef __FreeBSD__
--#include <stropts.h>
--#endif
--
- char *
- gftp_get_pty_impl (void)
- {
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)|| defined(__linux__))
+ #include <stropts.h>
+ #endif
+ 


Index: gftp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gftp.spec	24 Feb 2009 21:08:30 -0000	1.34
+++ gftp.spec	1 Mar 2009 18:16:43 -0000	1.35
@@ -1,17 +1,14 @@
 Summary: A multi-threaded FTP client for the X Window System
 Name: gftp
-Version: 2.0.18
-Release: 6%{?dist}
+Version: 2.0.19
+Release: 1%{?dist}
 Epoch: 2
 License: GPLv2+
 Group: Applications/Internet
 Url: http://gftp.seul.org/
 Source0: http://gftp.seul.org/%{name}-%{version}.tar.bz2 
 Source1: gftp-text-disabled.sh
-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
+Patch0: gftp-stropts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= 2.2.0
 BuildRequires: readline-devel
@@ -31,26 +28,17 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .thread-initialization
-%patch1 -p1 -b .user-dirs
-%patch2 -p1 -b .stropts
-%patch3 -p1 -b .fixbookmarks
+%patch0 -p1 -b .stropts
 
 %build
+%configure
 
-%ifarch alpha
-MIEEE_FLAG="-mieee"
-%endif
-CFLAGS="$RPM_OPT_FLAGS $MIEEE_FLAG" %configure
-make
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT make install
-
-# Get rid of bogus 'br' translation (pt_BR is included)
-rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale/br
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 # desktop-file-install is picky about this
 sed -i -e "s#Icon=gftp.png#Icon=/usr/share/pixmaps/gftp.png#" \
@@ -82,6 +70,10 @@
 %{_mandir}/man1/gftp.1.gz
 
 %changelog
+* Sun Mar 01 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 2:2.0.19-1
+- upgrade to 2.0.19
+- spec cleanup
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:2.0.18-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gftp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Feb 2005 04:26:45 -0000	1.9
+++ sources	1 Mar 2009 18:16:43 -0000	1.10
@@ -1 +1 @@
-44b19442d06f6dc68c7211d66029d826  gftp-2.0.18.tar.bz2
+5183cb4955d94be0e03c892585547c64  gftp-2.0.19.tar.bz2


--- gftp-2.0.18-bookmarks-cleanups.patch DELETED ---


--- gftp-2.0.18-thread-initialization.patch DELETED ---


--- gftp-2.0.18-user-dirs.patch DELETED ---