- ac25x patch (needed for autoconf 2.53), cosmetics, release 2

Changed files:
    fetchmail-ac25x.patch -> 1.1
    fetchmail.spec -> 1.160

diff --git a/fetchmail-ac25x.patch b/fetchmail-ac25x.patch
new file mode 100644 (file)
index 0000000..cbd610b
--- /dev/null
+++ b/fetchmail-ac25x.patch
@@ -0,0 +1,31 @@
+--- fetchmail-5.9.10/configure.in.orig Sat Mar  9 06:36:49 2002
++++ fetchmail-5.9.10/configure.in      Fri Mar 29 21:08:55 2002
+@@ -40,7 +40,6 @@
+ AC_SUBST(CPFLAGS)
+ AC_SUBST(CEFLAGS)
+ AC_SUBST(LDEFLAGS)
+-AC_SUBST(LIBOBJS)
+ 
+ # Check for LynxOS special case: -lbsd needed (at least on 2.3.0) and -s
+ # not working.
+--- fetchmail-5.9.10/Makefile.in.orig  Sun Mar 10 20:20:09 2002
++++ fetchmail-5.9.10/Makefile.in       Fri Mar 29 21:11:55 2002
+@@ -44,9 +44,6 @@
+ LOADLIBS = @LIBS@ @INTLLIBS@ @LEXLIB@
+ # LOADLIBS = -lsocket3r -lunix3r      # QNX
+ 
+-# Any extra object files your system needs.
+-extras = @LIBOBJS@
+-
+ # Extra sources/objects for library functions not provided on the host system.
+ EXTRASRC = @EXTRASRC@
+ # EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/alloca.c        # QNX
+@@ -98,7 +95,7 @@
+        report.o unmime.o conf.o checkalias.o smbdes.o smbencrypt.o smbmd4.o \
+        smbutil.o ipv6-connect.o lock.o
+ 
+-objs = $(protobjs) $(extras) $(EXTRAOBJ)
++objs = $(protobjs) $(EXTRAOBJ)
+ 
+ srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c                \
+        $(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/etrn.c             \

diff --git a/fetchmail.spec b/fetchmail.spec
index 1945c5ea1902559df76844032ae6ae3425ac1322..71499ba008ddfd7c0a3ab35a9291dc58bebc5134 100644 (file)
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -10,7 +10,7 @@ Summary(tr):  POP2, POP3, APOP, IMAP protokolleri ile uzaktan mektup alma yaz
 Summary(uk):   õÔÉ̦ÔÁ ÏÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú ×¦ÄÄÁÌÅÎϧ ÍÁÛÉÎÉ ÐÏ ÐÒÏÔÏËÏÌÁÍ POP/IMAP
 Name:          fetchmail
 Version:       5.9.10
-Release:       1
+Release:       2
 License:       GPL
 Vendor:                Eric S. Raymond <esr@thyrsus.com>
 Group:         Applications/Mail
@@ -20,6 +20,7 @@ Source2:      %{name}.sysconfig
 Source3:       %{name}.init
 Source4:       %{name}.logrotate
 Patch0:                %{name}-shroud.patch
+Patch1:                %{name}-ac25x.patch
 Icon:          fetchmail.gif
 URL:           http://www.tuxedo.org/~esr/fetchmail/
 BuildRequires: autoconf
@@ -28,9 +29,8 @@ BuildRequires:        bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 %{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.6a}
-BuildRequires: sed
-Requires:      smtpdaemon
 Requires:      setup >= 2.3
+Requires:      smtpdaemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -165,6 +165,7 @@ SySV init skrypt do uruchamiania systemowego fetchmaila jako daemon.
 %setup -q
 chmod -R u+w *
 %patch0 -p1
+%patch1 -p1
 
 %build
 gettextize --copy --force
@@ -207,6 +208,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/fetchmailrc
 
 %find_lang %{name}
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post daemon
 /sbin/chkconfig --add fetchmail
 if [ -f /var/lock/subsys/fetchmail ]; then
@@ -223,9 +227,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del fetchmail
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc *.gz