- up to 1.3.7

- drop home_etc hacks

diff --git a/yafc-errno.patch b/yafc-errno.patch
deleted file mode 100644 (file)
index 94e9402..0000000
--- a/yafc-errno.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN yafc-1.0.orig/lib/makepath.c yafc-1.0/lib/makepath.c
---- yafc-1.0.orig/lib/makepath.c       Tue Dec 11 12:21:51 2001
-+++ yafc-1.0/lib/makepath.c    Thu Mar 20 22:01:56 2003
-@@ -36,6 +36,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #if HAVE_UNISTD_H

diff --git a/yafc-gssapi.patch b/yafc-gssapi.patch
deleted file mode 100644 (file)
index 888e2bc..0000000
--- a/yafc-gssapi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- yafc-1.1.1/lib/gssapi.c~   2002-12-05 23:12:36.000000000 +0100
-+++ yafc-1.1.1/lib/gssapi.c    2011-08-03 12:21:52.505782271 +0200
-@@ -55,25 +55,6 @@
- # error "Need gssapi.h from either Heimdal or MIT krb5"
- #endif
- 
--
--
--
--/*
-- * The implementation must reserve static storage for a
-- * gss_OID_desc object containing the value
-- * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
-- *              "\x01\x02\x01\x04"}, corresponding to an
-- * object-identifier value of {iso(1) member-body(2)
-- * Unites States(840) mit(113554) infosys(1) gssapi(2)
-- * generic(1) service_name(4)}.  The constant
-- * GSS_C_NT_HOSTBASED_SERVICE should be initialized
-- * to point to that gss_OID_desc.
-- */
--static gss_OID_desc gss_c_nt_hostbased_service_oid_desc =
--{10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"};
--
--static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc;
--
- 
- 
- 

diff --git a/yafc-home_etc.patch b/yafc-home_etc.patch
deleted file mode 100644 (file)
index e3168ea..0000000
--- a/yafc-home_etc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nru yafc-1.0.orig/src/gvars.c yafc-1.0/src/gvars.c
---- yafc-1.0.orig/src/gvars.c  2002-12-02 13:38:48.000000000 +0100
-+++ yafc-1.0/src/gvars.c       2003-11-09 14:30:35.000000000 +0100
-@@ -122,6 +122,7 @@
- int gvHistoryMax = 128;
- 
- char *gvLocalHomeDir = 0;
-+char *gvHomeEtcDir = 0;
- char *gvLocalPrevDir = 0;
- char *gvHistoryFile = 0;
- 
-diff -Nru yafc-1.0.orig/src/gvars.h yafc-1.0/src/gvars.h
---- yafc-1.0.orig/src/gvars.h  2002-12-02 13:38:48.000000000 +0100
-+++ yafc-1.0/src/gvars.h       2003-11-09 14:31:33.000000000 +0100
-@@ -139,6 +139,7 @@
- extern list *gvLocalTagList; /* list of char* */
- 
- extern char *gvLocalHomeDir;
-+extern char *gvHomeEtcDir;
- extern char *gvLocalPrevDir;
- extern char *gvHistoryFile;
- 
-diff -Nru yafc-1.0.orig/src/main.c yafc-1.0/src/main.c
---- yafc-1.0.orig/src/main.c   2002-12-05 23:02:35.000000000 +0100
-+++ yafc-1.0/src/main.c        2003-11-09 14:28:39.000000000 +0100
-@@ -133,10 +133,14 @@
-       if(!gvLocalHomeDir)
-               gvLocalHomeDir = xstrdup(getenv("HOME"));
- 
-+      if(!gvHomeEtcDir) {
-+              if (getenv("HOME_ETC"))
-+                      gvHomeEtcDir = xstrdup(getenv("HOME_ETC"));
-+      }
-       gvWorkingDirectory = path_absolute(
-               gvWorkingDirectory ? gvWorkingDirectory : "~/.yafc",
-               get_local_curdir(),
--              gvLocalHomeDir);
-+              gvHomeEtcDir ? gvHomeEtcDir : gvLocalHomeDir);
- 
-       gvSSHProgram = xstrdup("/usr/bin/ssh");
- 

diff --git a/yafc-info.patch b/yafc-info.patch
deleted file mode 100644 (file)
index b6ed193..0000000
--- a/yafc-info.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- yafc-0.7.10/doc/yafc.texi~ Tue Oct 22 12:21:20 2002
-+++ yafc-0.7.10/doc/yafc.texi  Tue Oct 22 12:21:20 2002
-@@ -9,9 +9,10 @@
- 
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* Yafc: (yafc).  Yet Another FTP Client
--END-INFO-DIR-ENTRY
-+@dircategory Net utilities:
-+@direntry
-+* Yafc: (yafc).                               Yet Another FTP Client
-+@end direntry
- @end format
- This file documents Yafc version @value{VERSION}
- 

diff --git a/yafc-tinfo.patch b/yafc-tinfo.patch
deleted file mode 100644 (file)
index b8c3e4d..0000000
--- a/yafc-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN yafc-1.1.orig/cf/readline.m4 yafc-1.1/cf/readline.m4
---- yafc-1.1.orig/cf/readline.m4       2002-12-05 23:10:30.000000000 +0100
-+++ yafc-1.1/cf/readline.m4    2004-08-01 18:18:51.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- AC_DEFUN(YAFC_CHECK_READLINE,
- [
--  AC_SEARCH_LIBS(tgetent, [ncurses curses termcap], [])
-+  AC_SEARCH_LIBS(tgetent, [tinfo ncurses curses termcap], [])
- 
-   AC_MSG_CHECKING([for readline >= 2.0])
- 

diff --git a/yafc.spec b/yafc.spec
index 92ffd71dbabaa1a072a619a45a4b2b0a5ab134c9..dbed2d769a779c45519afe7bded4aaadf2fd7f35 100644 (file)
--- a/yafc.spec
+++ b/yafc.spec
@@ -1,23 +1,19 @@
+# TODO:
+#      - package bash completions
+#
 Summary:       Yafc is yet another FTP and SFTP client
 Summary(pl.UTF-8):     Yafc to Jeszcze Jeden Klient FTP oraz SFTP
 Name:          yafc
-Version:       1.1.1
-Release:       10
+Version:       1.3.7
+Release:       1
 License:       GPL
 Group:         Applications/Networking
-Source0:       http://dl.sourceforge.net/yafc/%{name}-%{version}.tar.bz2
-# Source0-md5: 832d074183a36ee15b47553ed5962fce
+Source0:       http://www.yafc-ftp.com/downloads/%{name}-%{version}.tar.xz
+# Source0-md5: 4b6e0d46ab7ab78956bbb106ae904820
 Source1:       %{name}.desktop
-URL:           http://yafc.sourceforge.net/
-Patch0:                %{name}-errno.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-tinfo.patch
-Patch3:                %{name}-home_etc.patch
-Patch4:                %{name}-gssapi.patch
-BuildRequires: autoconf
-BuildRequires: automake
+URL:           http://www.yafc-ftp.com/
 BuildRequires: heimdal-devel
-BuildRequires: libtool
+BuildRequires: libbsd-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 #BuildRequires:        socks5-devel
@@ -39,19 +35,8 @@ interfejs do protokołu FTP oraz SFTP.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-rm -f missing
-%{__libtoolize}
-%{__aclocal} -I cf
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure
 #      --with-socks5
 %{__make}
@@ -63,7 +48,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_desktopdir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install yafcrc.sample $RPM_BUILD_ROOT%{_sysconfdir}/yafcrc
+install samples/yafcrc $RPM_BUILD_ROOT%{_sysconfdir}/yafcrc
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
@@ -77,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS COPYRIGHT NEWS README THANKS TODO
+%doc BUGS COPYRIGHT NEWS README.md THANKS TODO
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/yafcrc
 %attr(755,root,root) %{_bindir}/*
 %{_desktopdir}/*.desktop