packages (SCREEN_4_0): screen/screen.spec rel 10; drop screenrc from skel; ...

[arekm]

Author: arekm                        Date: Fri Oct  8 08:29:01 2010 GMT
Module: packages                      Tag: SCREEN_4_0
---- Log message:
rel 10; drop screenrc from skel; include it in /etc/screenrc

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

---- Diffs:

================================================================
Index: packages/screen/screen.spec
diff -u packages/screen/screen.spec:1.102.4.1 packages/screen/screen.spec:1.102.4.2
--- packages/screen/screen.spec:1.102.4.1	Fri Apr 16 06:27:51 2010
+++ packages/screen/screen.spec	Fri Oct  8 10:28:56 2010
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	Менеджер екрану, що підтримує кілька логінів з одного терміналу
 Name:		screen
 Version:	4.0.3
-Release:	9
+Release:	10
 License:	GPL
 Group:		Applications/Terminal
 Source0:	ftp://ftp.uni-erlangen.de/pub/utilities/screen/%{name}-%{version}.tar.gz
@@ -149,8 +149,11 @@
 install screen			$RPM_BUILD_ROOT%{_bindir}
 install doc/screen.1		$RPM_BUILD_ROOT%{_mandir}/man1
 install doc/screen.info*	$RPM_BUILD_ROOT%{_infodir}
-install etc/etcscreenrc		$RPM_BUILD_ROOT%{_sysconfdir}/screenrc
-install %{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
+
 install utf8encodings/*		$RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -172,7 +175,6 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/screenrc
 %attr(755,root,root) %{_bindir}/screen
 %{_datadir}/screen
-%attr(600,root,root) /etc/skel/.screenrc
 %{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
@@ -185,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102.4.2  2010/10/08 08:28:56  arekm
+rel 10; drop screenrc from skel; include it in /etc/screenrc
+
 Revision 1.102.4.1  2010/04/16 04:27:51  arekm
 - rel 9
 
================================================================

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