From 0760e72dbea450d9b701503d0e40ff70489e6026 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 10:36:44 +0000 Subject: [PATCH] auto-import changelog data from postfix-1.1.11-11.src.rpm Mon Feb 24 2003 Elliot Lee - rebuilt 1.1.11-10 - don't copy winbind/wins nss modules, fixes #84553 Sat Feb 01 2003 Florian La Roche - sanitize rpm scripts a bit Wed Jan 22 2003 Tim Powers - rebuilt 1.1.11-8 - rebuild to fix krb5.h issue 1.1.11-7 - rebuild Fri Jan 03 2003 Nalin Dahyabhai - if pkgconfig knows about openssl, use its cflags and linker flags 1.1.11-6 - lib64'ize - build on all arches --- postfix.spec | 94 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/postfix.spec b/postfix.spec index 88e23f9..6f29e5c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -46,7 +46,7 @@ Obsoletes: sendmail exim qmail PreReq: %{_sbindir}/groupadd, %{_sbindir}/useradd Epoch: 2 Provides: MTA smtpd smtpdaemon /usr/bin/newaliases -Release: 5 +Release: 11 Summary: Postfix Mail Transport Agent Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/%{ftp_directory}/%{name}-%{version}.tar.bz2 Source3: postfix-etc-init.d-postfix @@ -69,7 +69,7 @@ Patch99: postfix-smtpd_multiline_greeting.patch BuildRoot: %{_tmppath}/%{name}-buildroot # Determine the different packages required for building postfix -BuildRequires: gawk, perl, sed, ed, db4-devel +BuildRequires: gawk, perl, sed, ed, db4-devel, pkgconfig %if %{LDAP} BuildRequires: openldap >= 1.2.9, openldap-devel >= 1.2.9 @@ -152,7 +152,7 @@ CCARGS="${CCARGS} -fsigned-char" %if %{LDAP} CCARGS="${CCARGS} -DHAS_LDAP" - AUXLIBS="${AUXLIBS} -L/usr/lib -lldap -llber" + AUXLIBS="${AUXLIBS} -L/usr/%{_lib} -lldap -llber" %endif %if %{PCRE} # -I option required for pcre 3.4 (and later?) @@ -161,16 +161,20 @@ CCARGS="${CCARGS} -fsigned-char" %endif %if %{MYSQL} CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" - AUXLIBS="${AUXLIBS} -L/usr/lib/mysql -lmysqlclient -lm" + AUXLIBS="${AUXLIBS} -L/usr/%{_lib}/mysql -lmysqlclient -lm" %endif %if %{SASL} CCARGS="${CCARGS} -DUSE_SASL_AUTH" AUXLIBS="${AUXLIBS} -lsasl" %endif %if %{TLS} - LIBS= - CCARGS="${CCARGS} -DHAS_SSL -I/usr/include/openssl" - AUXLIBS="${AUXLIBS} -lssl -lcrypto" + if pkg-config openssl ; then + CCARGS="${CCARGS} -DHAS_SSL `pkg-config --cflags openssl`" + AUXLIBS="${AUXLIBS} `pkg-config --libs openssl`" + else + CCARGS="${CCARGS} -DHAS_SSL -I/usr/include/openssl" + AUXLIBS="${AUXLIBS} -lssl -lcrypto" + fi %endif export CCARGS AUXLIBS @@ -216,8 +220,8 @@ install -c %{_sourcedir}/postfix-etc-init.d-postfix \ # These set up the chroot directory structure mkdir -p $RPM_BUILD_ROOT%{_var}/spool/postfix/etc -mkdir -p $RPM_BUILD_ROOT%{_var}/spool/postfix/lib -mkdir -p $RPM_BUILD_ROOT%{_var}/spool/postfix/usr/lib/zoneinfo +mkdir -p $RPM_BUILD_ROOT%{_var}/spool/postfix/%{_lib} +mkdir -p $RPM_BUILD_ROOT%{_var}/spool/postfix/usr/%{_lib}/zoneinfo install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail @@ -259,7 +263,7 @@ install -m 644 %SOURCE10 $RPM_BUILD_ROOT%{_libdir}/sasl/smtpd.conf cp %{SOURCE11} . # remove LICENSE file from /etc/postfix (it's still in docdir) -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/LICENSE ||: +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/LICENSE ed $RPM_BUILD_ROOT%{_sysconfdir}/postfix/postfix-files <.*,,"` -if [ -e "/lib/$DBVER" ]; then - copy "/lib/$DBVER" %{ROOT}/lib +if [ -e "/%{_lib}/$DBVER" ]; then + copy "/%{_lib}/$DBVER" %{ROOT}/%{_lib} fi %pre # Add user and groups if necessary -%{_sbindir}/groupadd -g %{maildrop_gid} -r %{maildrop_group} 2>/dev/null || : -%{_sbindir}/groupadd -g %{postfix_gid} -r postfix 2>/dev/null || : -%{_sbindir}/groupadd -g 12 -r mail 2>/dev/null || : -%{_sbindir}/useradd -d %{_var}/spool/postfix -s /sbin/nologin -g postfix -G mail -M -r -u %{postfix_uid} postfix 2>/dev/null || : +%{_sbindir}/groupadd -g %{maildrop_gid} -r %{maildrop_group} 2>/dev/null +%{_sbindir}/groupadd -g %{postfix_gid} -r postfix 2>/dev/null +%{_sbindir}/groupadd -g 12 -r mail 2>/dev/null +%{_sbindir}/useradd -d %{_var}/spool/postfix -s /sbin/nologin -g postfix -G mail -M -r -u %{postfix_uid} postfix 2>/dev/null +exit 0 %preun umask 022 @@ -385,16 +390,16 @@ if [ "$1" = 0 ]; then cd %{_var}/spool/postfix && { # Clean up chroot environment - rm -rf %{ROOT}/lib %{ROOT}/usr %{ROOT}/etc + rm -rf %{ROOT}/%{_lib} %{ROOT}/usr %{ROOT}/etc queue_directory_remove } - true # to ensure we exit safely fi # Remove unneeded symbolic links for i in samples; do - test -L %{_sysconfdir}/postfix/$i && rm %{_sysconfdir}/postfix/$i || true + test -L %{_sysconfdir}/postfix/$i && rm %{_sysconfdir}/postfix/$i done +exit 0 %postun if [ "$1" != 0 ]; then @@ -432,7 +437,7 @@ exit 0 %dir %verify(not md5 size mtime) %{_var}/spool/postfix %dir %attr(-, root, root) %verify(not md5 size mtime) %{_var}/spool/postfix/etc -%dir %attr(-, root, root) %verify(not md5 size mtime) %{_var}/spool/postfix/lib +%dir %attr(-, root, root) %verify(not md5 size mtime) %{_var}/spool/postfix/%{_lib} %attr(-, root, root) %verify(not md5 size mtime) %{_var}/spool/postfix/usr # For correct directory permissions check postfix-install script @@ -508,6 +513,31 @@ exit 0 %{_mandir}/*/* %changelog +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Tue Feb 18 2003 Bill Nottingham 2:1.1.11-10 +- don't copy winbind/wins nss modules, fixes #84553 + +* Sat Feb 01 2003 Florian La Roche +- sanitize rpm scripts a bit + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sat Jan 11 2003 Karsten Hopp 2:1.1.11-8 +- rebuild to fix krb5.h issue + +* Tue Jan 7 2003 Nalin Dahyabhai 2:1.1.11-7 +- rebuild + +* Fri Jan 3 2003 Nalin Dahyabhai +- if pkgconfig knows about openssl, use its cflags and linker flags + +* Thu Dec 12 2002 Tim Powers 2:1.1.11-6 +- lib64'ize +- build on all arches + * Wed Jul 24 2002 Karsten Hopp - make aliases.db config(noreplace) (#69612)