- Release 2.

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index e3684805c4c96a6a4654db2a0ac204a9badde356..de83c263c620f515c06763f24d9216d9c5109bb2 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -1,19 +1,19 @@
 # Conditional build:
-# bcond_off_pgsql - build wihtout PostgreSQ support
+# bcond_on_pgsql - build wihtout PostgreSQ support
 # bcond_on_mysql - build with MySQL support
 # bcond_off_ldap - build without LDAP support
 
 Summary:       University of Cambridge Mail Transfer Agent 
 Summary(pl):   Agent Transferu Poczty Uniwersytetu w Cambridge
 Name:          exim
-Version:       3.20
-Release:       3
+Version:       3.22
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Source0:       ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/%{name}-%{version}.tar.gz
-Source1:       ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/%{name}-texinfo-3.10.tar.gz
+Source0:       ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/%{name}-%{version}.tar.bz2
+Source1:       ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/%{name}-texinfo-3.20.tar.bz2
 Source2:       %{name}.init
 Source3:       %{name}.cron.db
 Source4:       %{name}.8
@@ -37,7 +37,8 @@ Patch4:               %{name}-Makefile-Default.patch
 URL:           http://www.exim.org/
 %{!?bcond_off_ldap:BuildRequires: openldap-devel >= 2.0.0}
 %{?bcond_on_mysql:BuildRequires: mysql-devel}
-%{!?bcond_off_pgsql:BuildRequires: postgresql-devel}
+%{?bcond_on_pgsql:BuildRequires: postgresql-devel}
+BuildRequires: XFree86-devel
 BuildRequires: texinfo
 BuildRequires: perl
 BuildRequires: pam-devel
@@ -111,12 +112,12 @@ cp src/EDITME Local/Makefile
 cp exim_monitor/EDITME Local/eximon.conf
 
 %build
-%{__make} CFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
+%{__make} CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}" \
        %{?bcond_on_mysql:LOOKUP_MYSQL=yes} \
-       %{!?bcond_off_pgsql:LOOKUP_PGSQL=yes} \
+       %{?bcond_on_pgsql:LOOKUP_PGSQL=yes} \
        %{!?bcond_off_ldap:LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2} \
-       LOOKUP_LIBS="%{!?bcond_off_ldap:-lldap -llber} %{?bcond_on_mysql:-lmysqlclient} %{!?bcond_off_pgsql:-lpq}" \
-       LOOKUP_INCLUDE="%{!?bcond_off_mysql:-I/usr/include/mysql} %{!?bcond_off_pgsql:-I/usr/include/pgsql}"
+       LOOKUP_LIBS="%{!?bcond_off_ldap:-lldap -llber} %{?bcond_on_mysql:-lmysqlclient} %{?bcond_on_pgsql:-lpq}" \
+       LOOKUP_INCLUDE="%{?bcond_on_mysql:-I/usr/include/mysql} %{?bcond_on_pgsql:-I/usr/include/pgsql}"
 
 makeinfo exim-texinfo-*/doc/{oview,spec,filter}.texinfo
 
@@ -169,7 +170,7 @@ else
        /usr/sbin/groupadd -g 79 -r -f exim
 fi
 
-if [ -n "`/bin/id/id -u exim 2>/dev/null`" ]; then
+if [ -n "`/bin/id -u exim 2>/dev/null`" ]; then
        if [ "`id -u exim`" != "79" ]; then
                echo "Warning: user exim doesn't have uid=79. Corect this before installing Exim" 1>&2
                exit 1
@@ -234,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr( 644,root,root) /etc/logrotate.d/exim
 %attr( 754,root,root) /etc/rc.d/init.d/exim
 %attr(4755,root,root) %{_bindir}/exim
-%attr( 775,root,mail) %dir %{_var}/mail
+%attr(1777,root,mail) %dir %{_var}/mail
 %attr( 770,root,exim) %dir %{_var}/spool/exim
 %attr( 750,exim,exim) %dir %{_var}/spool/exim/db
 %attr( 700,exim,root) %dir %{_var}/spool/exim/input