Accepting request 615839 from home:jengelh:branches:server:mail

- Remove redundant %clean section.
- Replace old $RPM_* shell vars by macros.

OBS-URL: https://build.opensuse.org/request/show/615839
OBS-URL: https://build.opensuse.org/package/show/server:mail/mailx?expand=0&rev=58
This commit is contained in:
Dr. Werner Fink 2018-06-11 09:52:20 +00:00 committed by Git OBS Bridge
parent d17def138a
commit 7a619d980e
2 changed files with 18 additions and 15 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jun 10 23:54:07 UTC 2018 - jengelh@inai.de
- Remove redundant %clean section.
- Replace old $RPM_* shell vars by macros.
-------------------------------------------------------------------
Thu Jun 7 09:35:26 UTC 2018 - werner@suse.de

View File

@ -86,27 +86,24 @@ minor enhancements like the ability to set a "From:" address.
%build
CC=gcc
CFLAGS="${RPM_OPT_FLAGS} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags openssl)"
CFLAGS="%{optflags} -pipe -D_GNU_SOURCE -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags openssl)"
export CC CFLAGS
$SHELL ./makeconfig
make %{?jobs:-j%jobs} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS"
make %{?_smp_mflags} PREFIX=/usr CC="$CC" CFLAGS="$CFLAGS"
tbl < mailx.1 | groff -mandocdb -Tps | grep -v %%%%CreationDate > manual.ps
gzip -9fn manual.ps
%install
make install PREFIX=/usr DESTDIR=${RPM_BUILD_ROOT}
rm -rf ${RPM_BUILD_ROOT}/bin
mkdir ${RPM_BUILD_ROOT}/bin
ln -sf ../usr/bin/mailx ${RPM_BUILD_ROOT}/bin/mail
ln -sf mailx ${RPM_BUILD_ROOT}/usr/bin/Mail
ln -sf mailx ${RPM_BUILD_ROOT}/usr/bin/mail
ln -sf mailx.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/Mail.1.gz
ln -sf mailx.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/mail.1.gz
install -m 0644 mail.rc ${RPM_BUILD_ROOT}/etc
mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%make_install PREFIX=/usr
rm -rf %{buildroot}/bin
mkdir %{buildroot}/bin
ln -sf ../usr/bin/mailx %{buildroot}/bin/mail
ln -sf mailx %{buildroot}/usr/bin/Mail
ln -sf mailx %{buildroot}/usr/bin/mail
ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/Mail.1.gz
ln -sf mailx.1.gz %{buildroot}%{_mandir}/man1/mail.1.gz
install -m 0644 mail.rc %{buildroot}/etc
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
%post
%{_sbindir}/update-alternatives --quiet --force \