From 7a619d980eead5bc26c3a17ea39413cf6cbb8c76d0701c2b96b6bccd7a836343 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 11 Jun 2018 09:52:20 +0000
Subject: [PATCH] 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
---
 mailx.changes |  6 ++++++
 mailx.spec    | 27 ++++++++++++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/mailx.changes b/mailx.changes
index e6ee89a..49baa28 100644
--- a/mailx.changes
+++ b/mailx.changes
@@ -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
 
diff --git a/mailx.spec b/mailx.spec
index 851173b..40a1bc2 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -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 \