- append our config to dist one; use rpmcppflags, too

Changed files:
    screen.spec -> 1.102.4.3

diff --git a/screen.spec b/screen.spec
index 14d111246f6f5ea2529cca6f37793e7d76408697..aa8711c38043d7d7b03dd399672db6896eaec3ce 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -134,7 +134,7 @@ for file in *.dist; do
 done
 
 %{__make} \
-       CFLAGS="%{rpmcflags} -DMAXWIN=128"
+       CFLAGS="%{rpmcppflags} %{rpmcflags} -DMAXWIN=128"
 
 cd doc
 rm -f screen.info*
@@ -149,9 +149,9 @@ install screen                      $RPM_BUILD_ROOT%{_bindir}
 install doc/screen.1           $RPM_BUILD_ROOT%{_mandir}/man1
 install doc/screen.info*       $RPM_BUILD_ROOT%{_infodir}
 
-cat %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+install etc/etcscreenrc $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
 echo -e "\n\n" > $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
-cat etc/etcscreenrc >> $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+cat %{SOURCE3} >> $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
 
 install utf8encodings/*                $RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings