packages (SCREEN_4_0): screen/screen.spec - append our config to dist one; ...

[arekm]

Author: arekm                        Date: Fri Oct  8 08:31:58 2010 GMT
Module: packages                      Tag: SCREEN_4_0
---- Log message:
- append our config to dist one; use rpmcppflags, too

---- Files affected:
packages/screen:
   screen.spec (1.102.4.2 -> 1.102.4.3) 

---- Diffs:

================================================================
Index: packages/screen/screen.spec
diff -u packages/screen/screen.spec:1.102.4.2 packages/screen/screen.spec:1.102.4.3
--- packages/screen/screen.spec:1.102.4.2	Fri Oct  8 10:28:56 2010
+++ packages/screen/screen.spec	Fri Oct  8 10:31:53 2010
@@ -135,7 +135,7 @@
 done
 
 %{__make} \
-	CFLAGS="%{rpmcflags} -DMAXWIN=128"
+	CFLAGS="%{rpmcppflags} %{rpmcflags} -DMAXWIN=128"
 
 cd doc
 rm -f screen.info*
@@ -150,9 +150,9 @@
 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
 
@@ -187,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102.4.3  2010/10/08 08:31:53  arekm
+- append our config to dist one; use rpmcppflags, too
+
 Revision 1.102.4.2  2010/10/08 08:28:56  arekm
 rel 10; drop screenrc from skel; include it in /etc/screenrc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/screen/screen.spec?r1=1.102.4.2&r2=1.102.4.3&f=u