rpms/lftp/devel .cvsignore, 1.31, 1.32 lftp-3.5.14-progress_overflow.patch, 1.1, 1.2 lftp.spec, 1.64, 1.65 sources, 1.31, 1.32 lftp-3.0.13-fix-cxxlink.patch, 1.1, NONE lftp-3.2.1.tar.bz2.asc, 1.1, NONE lftp-3.3.5-bz173276.patch, 1.2, NONE lftp-3.4.1-dont_core.patch, 1.1, NONE lftp-3.4.2-fix-redirect-coredump.patch, 1.2, NONE

Wed Jan 23 09:44:59 UTC 2008

Author: mnagy

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30655

Modified Files:
	.cvsignore lftp-3.5.14-progress_overflow.patch lftp.spec 
	sources 
Removed Files:
	lftp-3.0.13-fix-cxxlink.patch lftp-3.2.1.tar.bz2.asc 
	lftp-3.3.5-bz173276.patch lftp-3.4.1-dont_core.patch 
	lftp-3.4.2-fix-redirect-coredump.patch 
Log Message:
* Tue Jan 23 2008 Martin Nagy <mnagy at redhat.com> - 3.6.1-1
- upgrade to upstream version 3.6.1
- remove rpath and make some spec file changes for review (#225984)
- remove old patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32

--- .cvsignore	17 Sep 2007 08:19:16 -0000	1.31
+++ .cvsignore	23 Jan 2008 09:44:21 -0000	1.32
@@ -1 +1 @@
-lftp-3.5.14.tar.gz
+lftp-3.6.1.tar.gz

lftp-3.5.14-progress_overflow.patch:

Index: lftp-3.5.14-progress_overflow.patch
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp-3.5.14-progress_overflow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lftp-3.5.14-progress_overflow.patch	13 Dec 2007 07:45:39 -0000	1.1
+++ lftp-3.5.14-progress_overflow.patch	23 Jan 2008 09:44:21 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up lftp-3.5.14/src/FileCopy.cc.test lftp-3.5.14/src/FileCopy.cc
 --- lftp-3.5.14/src/FileCopy.cc.test	2007-12-11 09:48:03.000000000 +0100
 +++ lftp-3.5.14/src/FileCopy.cc	2007-12-11 09:48:36.000000000 +0100
-@@ -530,6 +530,6 @@ const char *FileCopy::GetPercentDoneStr(
+@@ -514,6 +514,6 @@ const char *FileCopy::GetPercentDoneStr(
        return "";
 -   static char buf[6];
 +   static char buf[8];


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- lftp.spec	13 Dec 2007 07:45:39 -0000	1.64
+++ lftp.spec	23 Jan 2008 09:44:21 -0000	1.65
@@ -1,13 +1,13 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.5.14
-Release: 	3%{?dist}
-License: 	GPL
+Version: 	3.6.1
+Release: 	1%{?dist}
+License: 	GPLv2+
 Group: 		Applications/Internet
 Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL: 		http://lftp.yar.ru/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, libtool, gettext
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, libtool, gettext, chrpath
 
 Patch1: lftp-3.5.14-progress_overflow.patch
 
@@ -39,15 +39,26 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
+make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/*
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
+iconv -f ISO88591 -t UTF8 NEWS -o NEWS.tmp
+mv -f NEWS.tmp NEWS
 # Remove files from $RPM_BUILD_ROOT that we aren't shipping.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-*.so
+# Remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/proto-http.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/liblftp-network.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/proto-sftp.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/proto-ftp.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/proto-fish.so
+mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo "%{_libdir}/lftp/%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %find_lang %{name}
 %if %{DEBUG}
 %{_libdir}/rpm/brp-compress
@@ -70,6 +81,8 @@
 %defattr(-,root,root,-)
 %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO
 %config(noreplace) %{_sysconfdir}/lftp.conf
+%config /etc/ld.so.conf.d/*
+
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/lftp
@@ -89,6 +102,11 @@
 %{_libdir}/liblftp-tasks*
 
 %changelog
+* Tue Jan 23 2008 Martin Nagy <mnagy at redhat.com> - 3.6.1-1
+- upgrade to upstream version 3.6.1
+- remove rpath and make some spec file changes for review (#225984)
+- remove old patches
+
 * Tue Dec 13 2007 Martin Nagy <mnagy at redhat.com> - 3.5.14-3
 - Fixed coredumping when downloading (#414051)
 
@@ -187,8 +205,8 @@
   bug 171096 : 'mget files in lftp causes abort' (core dump actually)
   resulted from not doing so .
   See http://lftp.yar.ru :
-    Recent events:2005-10-17: 
-    lftp-3.3.2 released. Fixed a coredump caused by double-free.
+	Recent events:2005-10-17: 
+	lftp-3.3.2 released. Fixed a coredump caused by double-free.
 
 * Sat Oct 15 2005 Florian La Roche <laroche at redhat.com> - 3.3.1-1
 - 3.3.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	17 Sep 2007 08:19:16 -0000	1.31
+++ sources	23 Jan 2008 09:44:21 -0000	1.32
@@ -1 +1 @@
-dfb019355ad7f7ed347e64b39e4d1d3c  lftp-3.5.14.tar.gz
+cb074387f2516efe6abe5664af5504f9  lftp-3.6.1.tar.gz


--- lftp-3.0.13-fix-cxxlink.patch DELETED ---


--- lftp-3.2.1.tar.bz2.asc DELETED ---


--- lftp-3.3.5-bz173276.patch DELETED ---


--- lftp-3.4.1-dont_core.patch DELETED ---


--- lftp-3.4.2-fix-redirect-coredump.patch DELETED ---


