rpms/lftp/F-13 lftp-4.0.5-manconf.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 lftp.spec, 1.89, 1.90 sources, 1.45, 1.46 lftp-4.0.5-ccc.patch, 1.1, NONE

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/lftp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23439

Modified Files:
	.cvsignore lftp.spec sources 
Added Files:
	lftp-4.0.5-manconf.patch 
Removed Files:
	lftp-4.0.5-ccc.patch 
Log Message:
* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> - 4.0.6-1
- update to latest upstream
- added vsftpd.conf(5)


lftp-4.0.5-manconf.patch:
 Makefile.am |    2 -
 Makefile.in |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 lftp.conf.5 |   11 ++++++++++
 3 files changed, 68 insertions(+), 7 deletions(-)

--- NEW FILE lftp-4.0.5-manconf.patch ---
diff -up lftp-4.0.5/doc/lftp.conf.5.manconf lftp-4.0.5/doc/lftp.conf.5
--- lftp-4.0.5/doc/lftp.conf.5.manconf	2010-04-01 14:22:54.105929171 +0200
+++ lftp-4.0.5/doc/lftp.conf.5	2010-04-01 14:22:54.105929171 +0200
@@ -0,0 +1,11 @@
+.TH LFTP.CONF 5
+.SH NAME
+lftp.conf \- the global configuration file for lftp
+
+.SH "DESCRIPTION"
+the /etc/lftp.conf configuration file changes the default behavior of lftp and affects the settings for all users. User-specific options should be set in either the ~/.lftprc or ~/.lftp/rc file. These configuration files are read when lftp starts up and the parameters defined therein take affect at that time.
+
+In addition to lftp's configuration options, aliases and 'set' commands can be defined in any of these configuration files. Refer to the Command and Settings sections of the lftp man page for more details.
+
+.SH SEE ALSO
+.BR lftp (1)
diff -up lftp-4.0.5/doc/Makefile.am.manconf lftp-4.0.5/doc/Makefile.am
--- lftp-4.0.5/doc/Makefile.am.manconf	2005-12-31 07:53:12.000000000 +0100
+++ lftp-4.0.5/doc/Makefile.am	2010-04-01 14:36:26.101664247 +0200
@@ -1,4 +1,4 @@
-man_MANS = lftp.1 lftpget.1
+man_MANS = lftp.1 lftpget.1 lftp.conf.5
 EXTRA_DIST = $(man_MANS)
 
 lftp.ps: lftp.1
diff -up lftp-4.0.5/doc/Makefile.in.manconf lftp-4.0.5/doc/Makefile.in
--- lftp-4.0.5/doc/Makefile.in.manconf	2009-12-21 17:27:01.000000000 +0100
+++ lftp-4.0.5/doc/Makefile.in	2010-04-01 14:35:49.162730211 +0200
@@ -129,7 +129,8 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
+man5dir = $(mandir)/man5
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
 NROFF = nroff
 MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -883,7 +884,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-man_MANS = lftp.1 lftpget.1
+man1_MANS = lftp.1 lftpget.1
+man5_MANS = lftp.conf.5
 EXTRA_DIST = $(man_MANS)
 all: all-am
 
@@ -968,6 +970,51 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
+install-man5: $(man5_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.5*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
+	done
+uninstall-man5:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.5*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    5*) ;; \
+	    *) ext='5' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -1008,6 +1055,9 @@ installdirs:
 	for dir in "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
+	for dir in "$(DESTDIR)$(man5dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -1060,7 +1110,7 @@ install-html: install-html-am
 
 install-info: install-info-am
 
-install-man: install-man1
+install-man: install-man1 install-man5
 
 install-pdf: install-pdf-am
 
@@ -1086,7 +1136,7 @@ ps-am:
 
 uninstall-am: uninstall-man
 
-uninstall-man: uninstall-man1
+uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: install-am install-strip
 
@@ -1095,12 +1145,12 @@ uninstall-man: uninstall-man1
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
+	install-info install-info-am install-man install-man1 install-man5 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-man uninstall-man1
+	uninstall uninstall-am uninstall-man uninstall-man1 uninstall-man5
 
 
 lftp.ps: lftp.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-13/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	4 Feb 2010 08:27:02 -0000	1.45
+++ .cvsignore	7 Apr 2010 10:49:05 -0000	1.46
@@ -1 +1 @@
-lftp-4.0.5.tar.lzma
+lftp-4.0.6.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-13/lftp.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- lftp.spec	4 Mar 2010 13:34:11 -0000	1.89
+++ lftp.spec	7 Apr 2010 10:49:05 -0000	1.90
@@ -1,7 +1,7 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.0.5
-Release:	2%{?dist}
+Version:	4.0.6
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
@@ -9,7 +9,7 @@ URL:		http://lftp.yar.ru/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
 
-Patch1: lftp-4.0.5-ccc.patch
+Patch1: lftp-4.0.5-manconf.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -29,7 +29,7 @@ Utility scripts for use with lftp.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ccc
+%patch1 -p1 -b .manconf
 
 #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
 sed -i.norpath -e \
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> - 4.0.6-1
+- update to latest upstream
+- added vsftpd.conf(5)
+
 * Thu Mar 04 2010 Jiri Skala <jskala at redhat.com> - 4.0.5-2
 - fixes #566562 - lftp doesn't properly implement CCC
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-13/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	4 Feb 2010 08:27:02 -0000	1.45
+++ sources	7 Apr 2010 10:49:05 -0000	1.46
@@ -1 +1 @@
-07803bc69f5f78538e2534a484af174f  lftp-4.0.5.tar.lzma
+f504a66ff9a4eeda2abda34c1409e33b  lftp-4.0.6.tar.lzma


--- lftp-4.0.5-ccc.patch DELETED ---