- fixed double "c" addition

[packages/exim.git] / exim.spec

diff --git a/exim.spec b/exim.spec
index 842696dc719bad4f6e71b3a20f8b024d3568a425..ca5dc29d0847f6fa87d97b4869666387f7ee34a3 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -11,7 +11,7 @@ Summary(pl):  Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR):        Servidor de correio eletrônico exim
 Name:          exim
 Version:       4.24
-Release:       1
+Release:       3
 Epoch:         2
 License:       GPL
 Group:         Networking/Daemons
@@ -41,6 +41,7 @@ Source13:     %{name}4-FAQ.txt.bz2
 Source14:      %{name}4-config.samples.tar.bz2
 # Source14-md5:        918b390124cfc7515ba262e49bee750f
 Source15:      %{name}4-smtp.pamd
+Source16:      %{name}on.png
 Patch0:                %{name}4-EDITME.patch
 Patch1:                %{name}4-monitor-EDITME.patch
 Patch2:                %{name}4-texinfo.patch
@@ -54,7 +55,7 @@ URL:          http://www.exim.org/
 %{!?_without_whoson:BuildRequires:     whoson-devel}
 BuildRequires: XFree86-devel
 BuildRequires: db-devel
-BuildRequires: openssl-devel >= 0.9.7b
+BuildRequires: openssl-devel >= 0.9.7c
 BuildRequires: pam-devel
 BuildRequires: pcre-devel
 BuildRequires: perl-devel >= 5.6.0
@@ -68,6 +69,7 @@ Requires(postun):     /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
+Requires:      pam >= 0.77.3
 Provides:      smtpdaemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     masqmail
@@ -113,7 +115,6 @@ Summary:    X11 based Exim administration tool
 Summary(pl):   Narzêdzia administracyjne exima dla X11
 Summary(pt_BR):        Monitor X11 para o exim
 Group:         X11/Applications
-Requires:      applnk
 
 %description X11
 X11 based monitor & administration utility for the Exim Mail Transfer
@@ -165,7 +166,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cron.{daily,weekly},logrotate.d,rc.d/init.d,sysconfig,mail,pam.d}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8,%{_libdir}}
 install -d $RPM_BUILD_ROOT%{_var}/{spool/exim/{db,input,msglog},log/{archiv,}/exim,mail}
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_prefix}/X11R6/bin,%{_applnkdir}/System}
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_prefix}/X11R6/bin,%{_desktopdir},%{_pixmapsdir}}
 
 install build-Linux-*/exim{,_fixdb,_tidydb,_dbmbuild,on.bin,_dumpdb,_lock} \
        build-Linux-*/exi{cyclog,next,what} %{SOURCE10} \
@@ -193,7 +194,8 @@ ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/rsmtp
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/rmail
 ln -sf %{_bindir}/exim $RPM_BUILD_ROOT%{_sbindir}/runq
 
-install %{SOURCE6} $RPM_BUILD_ROOT%{_applnkdir}/System
+install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE16} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 touch $RPM_BUILD_ROOT%{_var}/log/exim/{main,reject,panic,process}.log
 
@@ -293,4 +295,5 @@ fi
 %files X11
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_prefix}/X11R6/bin/*
-%{_applnkdir}/System/*
+%{_desktopdir}/%{name}on.desktop
+%{_pixmapsdir}/%{name}on.png