From bf59e46d614bbf5c500957921d0fcf52846c7a24 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 27 Mar 2007 12:32:20 +0000 Subject: [PATCH] - fix description (#234098) - spec cleanup Resolves: #234098 --- procmail-3.22-truncate.patch | 10 +++++----- procmail.spec | 36 +++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/procmail-3.22-truncate.patch b/procmail-3.22-truncate.patch index 12df2b1..c06cde3 100644 --- a/procmail-3.22-truncate.patch +++ b/procmail-3.22-truncate.patch @@ -1,16 +1,16 @@ ---- procmail-3.22/src/mailfold.c.truncate 2006-03-30 10:56:58.000000000 -0500 -+++ procmail-3.22/src/mailfold.c 2006-03-30 11:32:19.000000000 -0500 +--- procmail-3.22/src/mailfold.c.truncate 2007-03-27 13:24:05.000000000 +0200 ++++ procmail-3.22/src/mailfold.c 2007-03-27 13:25:06.000000000 +0200 @@ -30,6 +30,7 @@ int logopened,rawnonl; off_t lasttell; +static int trunced; - static off_t lastdump; + static long lastdump; static volatile int mailread; /* if the mail is completely read in already */ static struct dyna_array confield; /* escapes, concatenations */ @@ -81,6 +82,7 @@ - size_t len; - { int i;size_t part; + long len; + { int i;long part; lasttell=i= -1;SETerrno(EBADF); + trunced=0; if(s>=0) diff --git a/procmail.spec b/procmail.spec index 8f56089..798a2a5 100644 --- a/procmail.spec +++ b/procmail.spec @@ -1,37 +1,39 @@ -Summary: The procmail mail processing program. +Summary: The procmail mail processing program Name: procmail Version: 3.22 -Release: 18 +Release: 19%{?dist} License: GPL or Artistic -Group: System Environment/Daemons +Group: Applications/Internet Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz Source2: http://www.linux.org.uk/~telsa/BitsAndPieces/procmailrc URL: http://www.procmail.org Patch0: procmail-3.22-rhconfig.patch Patch1: procmail-3.15.1-man.patch Patch2: procmail_3.22-8.debian.patch -Patch3: procmail-3.22-large_files.patch Patch4: procmail-3.22-truncate.patch Patch5: procmail-3.22-ipv6.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -The procmail program is used by Red Hat Linux for all local mail -delivery. In addition to just delivering mail, procmail can be used -for automatic filtering, presorting, and other mail handling jobs. -Procmail is also the basis for the SmartList mailing list processor. +Procmail can be used to create mail-servers, mailing lists, sort your +incoming mail into separate folders/files (real convenient when subscribing +to one or more mailing lists or for prioritising your mail), preprocess +your mail, start any programs upon mail arrival (e.g. to generate different +chimes on your workstation for different types of mail) or selectively +forward certain incoming mail automatically to someone. %prep %setup -q %patch0 -p1 -b .rhconfig %patch1 -p1 %patch2 -p1 -%patch3 -p1 -b .largefiles %patch4 -p1 -b .truncate %patch5 -p1 -b .ipv6 +find examples -type f | xargs chmod 644 + %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" %install rm -rf ${RPM_BUILD_ROOT} @@ -40,10 +42,10 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,5} make \ BASENAME=${RPM_BUILD_ROOT}%{_prefix} MANDIR=${RPM_BUILD_ROOT}%{_mandir} \ - install + install cp debian/mailstat.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 -cp %SOURCE2 telsas_procmailrc +cp -p %{SOURCE2} telsas_procmailrc %clean @@ -54,13 +56,17 @@ rm -rf ${RPM_BUILD_ROOT} %doc Artistic COPYING FAQ FEATURES HISTORY README KNOWN_BUGS examples telsas_procmailrc debian/QuickStart debian/README.Maildir %{_bindir}/formail -%attr(2755,root,mail) %{_bindir}/lockfile +%attr(2755,root,mail) %{_bindir}/lockfile %{_bindir}/mailstat -%attr(0755,root,mail) %{_bindir}/procmail +%attr(0755,root,mail) %{_bindir}/procmail %{_mandir}/man[15]/* %changelog +* Tue Mar 27 2007 Miroslav Lichvar 3.22-19 +- fix description (#234098) +- spec cleanup + * Fri Oct 27 2006 Miroslav Lichvar 3.22-18 - add IPv6 support to comsat notification (#198403) - package man page for mailstat