SHA256
1
0
forked from pool/exim

- Replace >= 1230 by > 1220 as this type of condition is used anywhere else in

the exim spec file.
- Remove a trailing while space from the spec file.

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=131
This commit is contained in:
Lars Müller 2013-11-06 14:26:33 +00:00 committed by Git OBS Bridge
parent 47d42dea31
commit bfff3f2a71
2 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 27 17:35:43 UTC 2013 - p.drouand@gmail.com Sun Oct 27 17:35:43 UTC 2013 - p.drouand@gmail.com
- Add systemd support for openSUSE >= 12.3 - Add systemd support for openSUSE > 12.2
- Remove some obsolete conditionnal macros - Remove some obsolete conditionnal macros
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -38,11 +38,11 @@ Conflicts: sendmail sendmail-tls postfix
Provides: smtp_daemon Provides: smtp_daemon
%if %{?suse_version:%suse_version}%{?!suse_version:0} > 800 %if %{?suse_version:%suse_version}%{?!suse_version:0} > 800
Requires: logrotate Requires: logrotate
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%{?systemd_requires} %{?systemd_requires}
%else %else
Requires(pre): %insserv_prereq Requires(pre): %insserv_prereq
%endif %endif
Requires(pre): %fillup_prereq Requires(pre): %fillup_prereq
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
@ -248,7 +248,7 @@ rm -f doc/*.{orig,txt~}
make make
%install %install
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
mkdir -p $RPM_BUILD_ROOT/%{_unitdir} mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
%else %else
mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d
@ -266,7 +266,7 @@ make inst_dest=$RPM_BUILD_ROOT/usr/sbin \
INSTALL_ARG=-no_chown install INSTALL_ARG=-no_chown install
mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim
mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
install -m 755 %{S:32} $RPM_BUILD_ROOT/%{_unitdir}/exim.service install -m 755 %{S:32} $RPM_BUILD_ROOT/%{_unitdir}/exim.service
%else %else
install -m 755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim install -m 755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim
@ -282,7 +282,7 @@ do
ln -sf ../sbin/exim $RPM_BUILD_ROOT$i ln -sf ../sbin/exim $RPM_BUILD_ROOT$i
done done
ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail ln -sf exim $RPM_BUILD_ROOT/usr/sbin/sendmail
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
ln -sv ../../%{_unitdir}/exim.service $RPM_BUILD_ROOT/usr/sbin/rcexim ln -sv ../../%{_unitdir}/exim.service $RPM_BUILD_ROOT/usr/sbin/rcexim
%else %else
ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim ln -sv ../../etc/init.d/exim $RPM_BUILD_ROOT/usr/sbin/rcexim
@ -350,7 +350,7 @@ fi
for i in var/log/exim/main.log var/log/exim/panic.log var/log/exim/reject.log; do for i in var/log/exim/main.log var/log/exim/panic.log var/log/exim/reject.log; do
if ! test -e $i; then touch $i; chown mail:mail $i; chmod 640 $i ; fi if ! test -e $i; then touch $i; chown mail:mail $i; chmod 640 $i ; fi
done done
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
%{fillup_only} %{fillup_only}
%service_add_post exim.service %service_add_post exim.service
%else %else
@ -360,7 +360,7 @@ exit 0
%if %{?suse_version:%suse_version} %if %{?suse_version:%suse_version}
%preun %preun
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
%service_del_preun exim.service %service_del_preun exim.service
%else %else
%stop_on_removal exim %stop_on_removal exim
@ -369,7 +369,7 @@ exit 0
%postun %postun
%if %{?suse_version:%suse_version} %if %{?suse_version:%suse_version}
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
%service_del_postun exim.service %service_del_postun exim.service
%else %else
%restart_on_update exim %restart_on_update exim
@ -398,7 +398,7 @@ exit 0
/usr/sbin/exiqsumm /usr/sbin/exiqsumm
/usr/sbin/exiwhat /usr/sbin/exiwhat
%dir /etc/exim %dir /etc/exim
%if 0%{?suse_version} >=1230 %if 0%{?suse_version} > 1220
%{_unitdir}/exim.service %{_unitdir}/exim.service
%else %else
%config /etc/init.d/exim %config /etc/init.d/exim