diff --git a/exim.spec b/exim.spec index 00fe570..86cf91c 100644 --- a/exim.spec +++ b/exim.spec @@ -50,6 +50,7 @@ Source30: eximstats-html-update.py Source31: eximstats.conf Patch: exim-4.12-tail.patch Patch2: exim-4.60-external-pcre.diff +Patch3: exim-4.66-openssl-0.9.8e.patch %if !%{?build_with_mysql:1}0 %package -n eximon Summary: Eximon, an graphical frontend to administer Exim's mail queue @@ -113,6 +114,7 @@ Authors: %setup -q -n exim-%{version} %patch %patch2 -p1 +%patch3 -p1 # build with fPIE/pie on SUSE 10.0 or newer, or on any other platform %if %{?suse_version:%suse_version}%{?!suse_version:99999} > 930 fPIE="-fPIE" @@ -246,7 +248,7 @@ mkdir -p $RPM_BUILD_ROOT/var/log/exim mkdir -p $RPM_BUILD_ROOT/var/spool/mail/ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin +mkdir -p $RPM_BUILD_ROOT/usr/bin make inst_dest=$RPM_BUILD_ROOT/usr/sbin \ inst_conf=$RPM_BUILD_ROOT/etc/exim/exim.conf \ inst_info=$RPM_BUILD_ROOT/%{_infodir} \ @@ -267,7 +269,7 @@ done ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim %if !%{?build_with_mysql:1}0 -mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/X11R6/bin/ +mv $RPM_BUILD_ROOT/usr/sbin/eximon* $RPM_BUILD_ROOT/usr/bin/ %else rm $RPM_BUILD_ROOT/usr/sbin/eximon* %endif @@ -402,8 +404,8 @@ exit 0 %files -n eximon %defattr(-,root,root) -/usr/X11R6/bin/eximon -/usr/X11R6/bin/eximon.bin +/usr/bin/eximon +/usr/bin/eximon.bin %files -n eximstats-html %defattr(-,root,root) @@ -415,6 +417,8 @@ exit 0 %endif %changelog -n exim +* Thu Jan 25 2007 - sndirsch@suse.de +- move from /usr/X11R6 to /usr * Tue Jan 09 2007 - poeml@suse.de - update to 4.66 PH/01 Two more bugs that were introduced by 4.64/PH/07, in addition to the one