packages: screen/screen.spec - rel 1; drop skel screenrc; our config goes i...

[arekm]

Author: arekm                        Date: Fri Oct  8 08:20:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; drop skel screenrc; our config goes into /etc/screenrc

---- Files affected:
packages/screen:
   screen.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/screen/screen.spec
diff -u packages/screen/screen.spec:1.105 packages/screen/screen.spec:1.106
--- packages/screen/screen.spec:1.105	Sun Aug  1 14:17:11 2010
+++ packages/screen/screen.spec	Fri Oct  8 10:20:08 2010
@@ -19,11 +19,11 @@
 Summary(uk.UTF-8):	Менеджер екрану, що підтримує кілька логінів з одного терміналу
 Name:		screen
 Version:	4.1.0
-Release:	0.7
+Release:	1
 License:	GPL v3+
 Group:		Applications/Terminal
 Source0:	http://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-a805439f6443fb0e00ac6caff92f99950c1ddda8.tar.gz
-# Source0-md5:	fa1677dfd3880772b4bc5a3aa598f4fe
+# Source0-md5:	1aca27adebec4ab0c3a8ee683675a7fd
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	236166e774cee788cf594b05dd1dd70d
 Source2:	%{name}.pamd
@@ -156,8 +156,11 @@
 install -p screen $RPM_BUILD_ROOT%{_bindir}
 cp -a doc/screen.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -a doc/screen.info* $RPM_BUILD_ROOT%{_infodir}
-cp -a etc/etcscreenrc $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/skel/.screenrc
+
+cat %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+echo -e "\n\n" > $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+cat etc/etcscreenrc >> $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+
 cp -a utf8encodings/* $RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/screen
 
@@ -178,7 +181,6 @@
 %doc NEWS README ChangeLog doc/{FAQ,README.DOTSCREEN} etc/screenrc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/screenrc
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
-%attr(600,root,root) /etc/skel/.screenrc
 %attr(755,root,root) %{_bindir}/screen
 %{_datadir}/screen
 %{_mandir}/man1/*
@@ -192,6 +194,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2010/10/08 08:20:08  arekm
+- rel 1; drop skel screenrc; our config goes into /etc/screenrc
+
 Revision 1.105  2010/08/01 12:17:11  glen
 - up to 2010-06-22 snap, License is GPL v3+
 
================================================================

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