- unified, killed /usr/X11R6 prefix in -X11

Changed files:
    exim.spec -> 1.227

diff --git a/exim.spec b/exim.spec
index 1d54829e893944d6009e4d1850651cae786ce26a..92d3fc6a71b9d52f737c2c49b979c352aeee3c33 100644 (file)
--- a/exim.spec
+++ b/exim.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without pgsql   # without PostgreSQL support
 %bcond_without mysql   # without MySQL support
@@ -179,8 +180,8 @@ cp -f exim_monitor/EDITME Local/eximon.conf
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} %{?with_spf:-DSPF} %{?with_srs:-DSRS}" \
        LOOKUP_CDB=yes \
-XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \
-X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \
+       XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \
+       X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \
        %{?with_mysql:LOOKUP_MYSQL=yes} \
        %{?with_pgsql:LOOKUP_PGSQL=yes} \
        %{?with_whoson:LOOKUP_WHOSON=yes} \
@@ -197,25 +198,25 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail
 install -d $RPM_BUILD_ROOT/etc/{cron.{daily,weekly},logrotate.d,rc.d/init.d,sysconfig,pam.d}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man8,/usr/lib}
 install -d $RPM_BUILD_ROOT%{_var}/{spool/exim/{db,input,msglog},log/{archiv,}/exim,mail}
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_prefix}/X11R6/bin,%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_desktopdir},%{_pixmapsdir}}
 
 install build-Linux-*/exim{,_fixdb,_tidydb,_dbmbuild,on.bin,_dumpdb,_lock} \
        build-Linux-*/exi{cyclog,next,what} %{SOURCE10} \
        build-Linux-*/{exigrep,eximstats,exiqsumm,convert4r4} \
        util/unknownuser.sh \
        $RPM_BUILD_ROOT%{_bindir}
-install build-Linux-*/eximon.bin $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-install build-Linux-*/eximon $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
+install build-Linux-*/eximon.bin $RPM_BUILD_ROOT%{_bindir}
+install build-Linux-*/eximon $RPM_BUILD_ROOT%{_bindir}
 
 install %{SOURCE5} .
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.weekly/
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.weekly
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install        %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mail/exim.conf
-install {doc,man}/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install {doc,man}/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
-install        *.info* $RPM_BUILD_ROOT%{_infodir}/
+install        *.info* $RPM_BUILD_ROOT%{_infodir}
 install %{SOURCE15} $RPM_BUILD_ROOT/etc/pam.d/smtp
 
 %{?with_saexim:install sa-exim-%{saexim_version}/sa-exim.conf $RPM_BUILD_ROOT/%{_sysconfdir}/mail/sa-exim.conf}
@@ -299,11 +300,11 @@ fi
 %defattr(644,root,root,755)
 %doc README* NOTICE LICENCE analyse-log-errors doc/{ChangeLog,NewStuff,dbm.discuss.txt,filter.txt,spec.txt,Exim*.upgrade,OptionLists.txt%{?with_exiscan:,exiscan-*.txt}} build-Linux-*/transport-filter.pl
 %dir %{_sysconfdir}/mail
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mail/exim.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/exim.conf
 %{?with_saexim:%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mail/sa-exim.conf}
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mail/aliases
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/exim
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/exim
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/exim
+%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/exim
 %attr(754,root,root) /etc/rc.d/init.d/exim
 %attr(4755,root,root) %{_bindir}/exim
 %attr(770,root,exim) %dir %{_var}/spool/exim
@@ -330,12 +331,13 @@ fi
 %attr(750,exim,root) %dir %{_var}/log/exim
 %attr(750,exim,root) %dir %{_var}/log/archiv/exim
 %attr(640,exim,root) %ghost %{_var}/log/exim/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/smtp
-%{_infodir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/smtp
+%{_infodir}/*.info*
 %{_mandir}/man8/*
 
 %files X11
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_prefix}/X11R6/bin/*
-%{_desktopdir}/%{name}on.desktop
-%{_pixmapsdir}/%{name}on.png
+%attr(755,root,root) %{_bindir}/eximon
+%attr(755,root,root) %{_bindir}/eximon.bin
+%{_desktopdir}/eximon.desktop
+%{_pixmapsdir}/eximon.png