diff --git a/ftp.spec b/ftp.spec index 1c02ad2..46dfc80 100644 --- a/ftp.spec +++ b/ftp.spec @@ -1,7 +1,7 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client Name: ftp Version: 0.17 -Release: 37%{?dist} +Release: 38%{?dist} License: BSD Group: Applications/Internet Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2 @@ -21,8 +21,8 @@ Patch13: netkit-ftp-0.17-multihome.patch Patch14: netkit-ftp-0.17-longnames.patch Patch15: netkit-ftp-0.17-multiipv6.patch Patch16: netkit-ftp-0.17-nodebug.patch +Patch17: netkit-ftp-0.17-stamp.patch -#BuildRoot: /var/tmp/%{name}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel, readline-devel, ncurses-devel @@ -52,6 +52,7 @@ file transfers. %patch14 -p1 -b .patch %patch15 -p1 -b .multiipv6 %patch16 -p1 -b .nodebug +%patch17 -p1 -b .stamp %build sh configure --with-c-compiler=gcc --enable-ipv6 @@ -86,7 +87,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man5/netrc.* %changelog -* Mon Feb 6 2007 Marcela Maslanova - 0.17-37 +* Mon Feb 7 2007 Marcela Maslanova - 0.17-38 - add gpl - spec fix - rhbz#225774 diff --git a/netkit-ftp-0.17-stamp.patch b/netkit-ftp-0.17-stamp.patch new file mode 100644 index 0000000..afbb5f2 --- /dev/null +++ b/netkit-ftp-0.17-stamp.patch @@ -0,0 +1,23 @@ +--- netkit-ftp-0.17/ftp/Makefile.stamp 2007-02-07 05:21:13.000000000 -0500 ++++ netkit-ftp-0.17/ftp/Makefile 2007-02-07 05:26:13.453244000 -0500 +@@ -16,14 +16,14 @@ + cmds.o glob.o: glob.h + + install: ftp +- install -d $(INSTALLROOT)$(BINDIR) +- install -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR) ++ install -p -d $(INSTALLROOT)$(BINDIR) ++ install -p -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR) + ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp +- install -d $(INSTALLROOT)$(MANDIR)/man1 +- install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1 ++ install -p -d $(INSTALLROOT)$(MANDIR)/man1 ++ install -p -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1 + ln -sf ftp.1 $(INSTALLROOT)$(MANDIR)/man1/pftp.1 +- install -d $(INSTALLROOT)$(MANDIR)/man5 +- install -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5 ++ install -p -d $(INSTALLROOT)$(MANDIR)/man5 ++ install -p -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5 + + clean: + rm -f *.o ftp