- one more update

[packages/sendmail.git] / sendmail.spec

diff --git a/sendmail.spec b/sendmail.spec
index 254d4473831869d6a21e269c87c2bd01a8c7455f..6e9435fed1479c83a0226bacf8ae907b0f3f663f 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -24,24 +24,24 @@ Source5:    %{name}-etc-mail-Makefile
 Source6:       %{name}.mc
 Source7:       %{name}-config.m4
 Source8:       %{name}.sasl
-Patch0:                %{name}-redhat.patch
+Patch0:                %{name}-makefile.patch
+#Patch0:               %{name}-redhat.patch
 Patch1:                %{name}-makemapman.patch
 Patch2:                %{name}-smrsh-paths.patch
 Patch3:                %{name}-rmail.patch
-Patch4:                %{name}-manpath.patch
+Patch4:                %{name}-os-paths.patch
 Patch5:                %{name}-m4path.patch
 Patch6:                %{name}-dtelnet.patch
 Patch7:                %{name}-pld.mc.patch
 Patch8:                %{name}-redirect.patch
 Patch9:                %{name}-hprescan-dos.patch
-Patch10:       %{name}-aliasesDoS.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: db3-devel
 %{!?_without_ldap:BuildRequires:       openldap-devel}
 BuildRequires: pam-devel
 Requires:      m4
-Prereq:                /sbin/chkconfig
+Prereq:                chkconfig
 Provides:      smtpdaemon
 Obsoletes:     smtpdaemon
 Obsoletes:     exim
@@ -93,17 +93,16 @@ istiyorsan
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p0
-#%patch5 -p1
-#%patch6 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 %patch7 -p1
-#%patch8 -p1
-#%patch9 -p1
-#%patch10 -p1
+%patch8 -p1
+%patch9 -p1
 
 # seems to be obsoleted...
 #tar xf %{SOURCE2} -C cf
@@ -148,7 +147,9 @@ OBJDIR=obj.$(uname -s).$(uname -r).$(arch)
 IDNU=`id -nu`
 IDNG=`id -ng`
 SMINSTOPT="DESTDIR=$RPM_BUILD_ROOT SBINOWN=$IDNU SBINGRP=$IDNG \
-       UBINOWN=$IDNU UBINGRP=$IDNG MANOWN=$IDNU MANGRP=$IDNG"
+       UBINOWN=$IDNU UBINGRP=$IDNG MANOWN=$IDNU MANGRP=$IDNG \
+       CFOWN=$IDNU CFGRP=$IDNG MSPQOWN=$IDNU GBINGRP=$IDNG \
+       BINOWN=$IDNU BINGRP=$IDNG"
 %{__make} $SMINSTOPT install -C $OBJDIR/sendmail
 %{__make} $SMINSTOPT install -C $OBJDIR/mailstats
 %{__make} $SMINSTOPT install -C $OBJDIR/praliases
@@ -160,8 +161,8 @@ ln -sf ../sbin/makemap $RPM_BUILD_ROOT%{_bindir}/makemap
 # install docs by hand
 install -d $RPM_BUILD_ROOT%{_docdir}/sendmail
 cp -ar FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc $RPM_BUILD_ROOT%{_docdir}/sendmail
-cp smrsh/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.smrsh
-cp cf/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.cf
+cp -f smrsh/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.smrsh
+cp -f cf/README $RPM_BUILD_ROOT%{_docdir}/sendmail/README.cf
 
 # install the cf files
 cd cf