Accepting request 963650 from server:mail
- Fix number check of test (builtin) in %pre scriptlet (boo#1197317) OBS-URL: https://build.opensuse.org/request/show/963650 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mailx?expand=0&rev=46
This commit is contained in:
commit
4b5cfebae6
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 21 10:31:05 UTC 2022 - Dr. Werner Fink <werner@suse.de>
|
||||||
|
|
||||||
|
- Fix number check of test (builtin) in %pre scriptlet (boo#1197317)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 17 21:22:49 UTC 2022 - Stefan Schubert <schubi@suse.de>
|
Thu Feb 17 21:22:49 UTC 2022 - Stefan Schubert <schubi@suse.de>
|
||||||
|
|
||||||
|
11
mailx.spec
11
mailx.spec
@ -114,7 +114,7 @@ minor enhancements like the ability to set a "From:" address.
|
|||||||
rm -rf %{buildroot}/bin
|
rm -rf %{buildroot}/bin
|
||||||
mkdir %{buildroot}/bin
|
mkdir %{buildroot}/bin
|
||||||
%if ! %{with libalternatives}
|
%if ! %{with libalternatives}
|
||||||
# create symlinks for update-alternatives
|
# create symlinks for update-alternatives
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||||
%if !0%{?usrmerged}
|
%if !0%{?usrmerged}
|
||||||
ln -sf %{_sysconfdir}/alternatives/binmail %{buildroot}/bin/mail
|
ln -sf %{_sysconfdir}/alternatives/binmail %{buildroot}/bin/mail
|
||||||
@ -152,11 +152,11 @@ binary=%{_bindir}/mailx
|
|||||||
man=mailx.1
|
man=mailx.1
|
||||||
group=mail, Mail
|
group=mail, Mail
|
||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
install -m 0644 mail.rc %{buildroot}/etc
|
install -m 0644 mail.rc %{buildroot}/etc
|
||||||
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
|
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
|
||||||
|
|
||||||
%if ! %{with libalternatives}
|
%if ! %{with libalternatives}
|
||||||
%post
|
%post
|
||||||
%{_sbindir}/update-alternatives --quiet --force \
|
%{_sbindir}/update-alternatives --quiet --force \
|
||||||
--install %{_bindir}/mail mail %{_bindir}/mailx 20 \
|
--install %{_bindir}/mail mail %{_bindir}/mailx 20 \
|
||||||
@ -172,10 +172,11 @@ if test ! -e %{_bindir}/mailx; then
|
|||||||
%{_sbindir}/update-alternatives --quiet --force --remove mail %{_bindir}/mailx
|
%{_sbindir}/update-alternatives --quiet --force --remove mail %{_bindir}/mailx
|
||||||
fi
|
fi
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
# removing old update-alternatives entries
|
# removing old update-alternatives entries
|
||||||
if [ "$1" > 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
|
if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
|
||||||
%{_sbindir}/update-alternatives --quiet --force --remove mail %{_bindir}/mailx
|
%{_sbindir}/update-alternatives --quiet --force --remove mail %{_bindir}/mailx
|
||||||
fi
|
fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user