packages: ncftp/ncftp.spec, ncftp/ncftp-DESTDIR.patch - up to 3.2.3 - move ...

[draenog]

Author: draenog                      Date: Tue Apr  6 21:24:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.2.3
- move patch from the KAME project to distfiles
- adapterized

---- Files affected:
packages/ncftp:
   ncftp.spec (1.83 -> 1.84) , ncftp-DESTDIR.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/ncftp/ncftp.spec
diff -u packages/ncftp/ncftp.spec:1.83 packages/ncftp/ncftp.spec:1.84
--- packages/ncftp/ncftp.spec:1.83	Fri May 15 19:43:36 2009
+++ packages/ncftp/ncftp.spec	Tue Apr  6 23:24:40 2010
@@ -5,21 +5,22 @@
 Summary(pl.UTF-8):	Zaawansowany klient FTP
 Summary(pt_BR.UTF-8):	Cliente FTP com uma interface agradável
 Name:		ncftp
-Version:	3.2.2
-Release:	2
+Version:	3.2.3
+Release:	0.001
 Epoch:		2
 License:	The Clarified Artistic License
 Group:		Applications/Networking
 Source0:	ftp://ftp.ncftp.com/ncftp/%{name}-%{version}-src.tar.bz2
-# Source0-md5:	b2b4b2fd38c81754b8f13895d784d491
+# Source0-md5:	fac4aa169e1734e8d9617afd4a9b51e5
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	ncftpbookmarks.1
+Source4:		ftp://ftp.kame.net/pub/kame/misc/ncftp-323-v6-20091109.diff.gz
+# Source4-md5:	9120dcbb0fceacb5174d01024b0ba5a5
 Patch0:		%{name}-DESTDIR.patch
 Patch1:		%{name}-shared.patch
-Patch2:		ftp://ftp.kame.net/pub/kame/misc/ncftp-322-v6-20080821.diff.gz
-Patch3:		%{name}-ac25x.patch
-Patch4:		%{name}-home_etc.patch
+Patch2:		%{name}-ac25x.patch
+Patch3:		%{name}-home_etc.patch
 URL:		http://www.ncftp.com/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	ncurses-devel >= 5.0
@@ -50,14 +51,14 @@
 
 %prep
 %setup -q
+gunzip -c %{SOURCE4} | patch -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
-ln -sf autoconf/aclocal.m4 .
+ln -sf autoconf_local/aclocal.m4 .
 %{__autoconf}
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 CPPFLAGS="-I/usr/include/ncurses"
@@ -108,6 +109,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2010/04/06 21:24:40  draenog
+- up to 3.2.3
+- move patch from the KAME project to distfiles
+- adapterized
+
 Revision 1.83  2009/05/15 17:43:36  hawk
 - updated md5 (silent bugfix release with same version)
 

================================================================
Index: packages/ncftp/ncftp-DESTDIR.patch
diff -u packages/ncftp/ncftp-DESTDIR.patch:1.5 packages/ncftp/ncftp-DESTDIR.patch:1.6
--- packages/ncftp/ncftp-DESTDIR.patch:1.5	Wed Aug 27 20:56:17 2008
+++ packages/ncftp/ncftp-DESTDIR.patch	Tue Apr  6 23:24:40 2010
@@ -8,41 +8,41 @@
  
  @SET_MAKE@
  CC=@CC@
-@@ -65,24 +66,24 @@
+@@ -66,24 +66,24 @@
  	-@/bin/ls -l $(LIBSOS) $(LIBSO)
  
  soinstall: $(LIBSO)
--	[ -d "$(PREFIX)/lib" ] || mkdir -m 755 "$(PREFIX)/lib"
--	[ -d "$(PREFIX)/include" ] || mkdir -m 755 "$(PREFIX)/include"
+-	[ -d "$(PREFIX)/lib" ] || mkdir -m 755 -p "$(PREFIX)/lib"
+-	[ -d "$(PREFIX)/include" ] || mkdir -m 755 -p "$(PREFIX)/include"
 -	cp $(LIBSO) $(PREFIX)/lib/$(LIBSO)
 -	( cd $(PREFIX)/lib ; /bin/rm -f $(LIBSOS) ; /bin/ln -s $(LIBSO) $(LIBSOS) )
 -	cp ncftp.h ncftp_errno.h $(PREFIX)/include
 -	-chmod a+r $(PREFIX)/lib/$(LIBSO) $(PREFIX)/include/ncftp.h $(PREFIX)/include/ncftp_errno.h
 -	-@/bin/ls -ld $(PREFIX)/lib/$(LIBSO)
-+	[ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 "$(DESTDIR)$(LIBDIR)"
-+	[ -d "$(DESTDIR)$(PREFIX)/include" ] || mkdir -m 755 "$(DESTDIR)$(PREFIX)/include"
++	[ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 -p "$(DESTDIR)$(LIBDIR)"
++	[ -d "$(DESTDIR)/$(PREFIX)/include" ] || mkdir -m 755 -p "$(DESTDIR)/$(PREFIX)/include"
 +	cp $(LIBSO) $(DESTDIR)$(LIBDIR)/$(LIBSO)
 +	( cd $(DESTDIR)$(LIBDIR) ; /bin/rm -f $(LIBSOS) ; /bin/ln -s $(LIBSO) $(LIBSOS) )
-+	cp ncftp.h ncftp_errno.h $(DESTDIR)$(PREFIX)/include
-+	-chmod a+r $(DESTDIR)$(LIBDIR)/$(LIBSO) $(DESTDIR)$(PREFIX)/include/ncftp.h $(DESTDIR)$(PREFIX)/include/ncftp_errno.h
++	cp ncftp.h ncftp_errno.h $(DESTDIR)/$(PREFIX)/include
++	-chmod a+r $(DESTDIR)$(LIBDIR)/$(LIBSO) $(DESTDIR)/$(PREFIX)/include/ncftp.h $(DESTDIR)/$(PREFIX)/include/ncftp_errno.h
 +	-@/bin/ls -ld $(DESTDIR)$(LIBDIR)/$(LIBSO)
  	- at echo
  	- at echo "Make sure that your dynamic loader searches for the directory $(PREFIX)/lib."
  	- at echo "For example, edit /etc/ld.so.conf accordingly if your system uses ld.so."
  
  install: $(LIB)
--	[ -d "$(PREFIX)/lib" ] || mkdir -m 755 "$(PREFIX)/lib"
--	[ -d "$(PREFIX)/include" ] || mkdir -m 755 "$(PREFIX)/include"
+-	[ -d "$(PREFIX)/lib" ] || mkdir -m 755 -p "$(PREFIX)/lib"
+-	[ -d "$(PREFIX)/include" ] || mkdir -m 755 -p "$(PREFIX)/include"
 -	cp $(LIB) $(PREFIX)/lib/$(LIB)
 -	-@@RANLIB@ $(PREFIX)/lib/$(LIB)
 -	cp ncftp.h ncftp_errno.h $(PREFIX)/include
 -	-chmod a+r $(LIB) $(PREFIX)/lib/$(LIB) $(PREFIX)/include/ncftp.h $(PREFIX)/include/ncftp_errno.h
-+	[ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 "$(DESTDIR)$(LIBDIR)"
-+	[ -d "$(DESTDIR)$(PREFIX)/include" ] || mkdir -m 755 "$(DESTDIR)$(PREFIX)/include"
++	[ -d "$(DESTDIR)$(LIBDIR)" ] || mkdir -m 755 -p "$(DESTDIR)$(LIBDIR)"
++	[ -d "$(DESTDIR)/$(PREFIX)/include" ] || mkdir -m 755 -p "$(DESTDIR)/$(PREFIX)/include"
 +	cp $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB)
 +	-@@RANLIB@ $(DESTDIR)$(LIBDIR)/$(LIB)
-+	cp ncftp.h ncftp_errno.h $(DESTDIR)$(PREFIX)/include
-+	-chmod a+r $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(PREFIX)/include/ncftp.h $(DESTDIR)$(PREFIX)/include/ncftp_errno.h
++	cp ncftp.h ncftp_errno.h $(DESTDIR)/$(PREFIX)/include
++	-chmod a+r $(LIB) $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)/$(PREFIX)/include/ncftp.h $(DESTDIR)/$(PREFIX)/include/ncftp_errno.h
  	( cd ../sio ; $(MAKE) "PREFIX=$(PREFIX)" install)
  	( cd ../Strn ; $(MAKE) "PREFIX=$(PREFIX)" install_min )
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncftp/ncftp.spec?r1=1.83&r2=1.84&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncftp/ncftp-DESTDIR.patch?r1=1.5&r2=1.6&f=u