X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=screen.spec;h=4b4d8a348a31665d9773bca2bb9914b9a1811d2e;hb=0a5ad8df5f9a8b2a3af6b21a8d645d8fbd77af79;hp=d49ba95dc92ebd07f7dc566f36bed288fe40f6d1;hpb=bc78afa86acc605436be7a6bbb9522566c31f566;p=packages%2Fscreen.git

diff --git a/screen.spec b/screen.spec
index d49ba95..4b4d8a3 100644
--- a/screen.spec
+++ b/screen.spec
@@ -17,16 +17,16 @@ Summary(ru.UTF-8):	Менеджер экрана, поддерживающий 
 Summary(tr.UTF-8):	Bir uçbirimde birden fazla oturumu düzenler
 Summary(uk.UTF-8):	Менеджер екрану, що підтримує кілька логінів з одного терміналу
 Name:		screen
-Version:	4.1
-Release:	0.6
-License:	GPL
+Version:	4.1.0
+Release:	1.2
+License:	GPL v3+
 Group:		Applications/Terminal
-Source0:	http://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-7851249fa3e5a9ce00ad3bf8bd0b417acb335f84.tar.gz
-# Source0-md5:	a1b42f6505230ecdb943d95231b3e358
+Source0:	http://git.savannah.gnu.org/cgit/screen.git/snapshot/%{name}-a805439f6443fb0e00ac6caff92f99950c1ddda8.tar.gz
+# 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
-Source3:	screenrc
+Source3:	%{name}rc
 Patch1:		%{name}-compat21.patch
 Patch2:		%{name}-manual.patch
 Patch3:		%{name}-ia64.patch
@@ -41,7 +41,6 @@ Patch11:	%{name}-inputline-size.patch
 Patch12:	%{name}-screenrc.patch
 Patch13:	%{name}-osc.patch
 Patch15:	%{name}-statusline-encoding.patch
-Patch16:	%{name}-etcscreenrc.patch
 URL:		http://www.gnu.org/software/screen/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -131,12 +130,13 @@ mv screen-*/src/* .
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-CFLAGS="%{rpmcflags} -DMAXWIN=128"
+CFLAGS="%{rpmcflags} -DMAXWIN=256"
 %{?with_fifo:nore=1} \
 %configure \
 	--enable-pam \
 	--enable-colors256 \
 	--enable-rxvt_osc \
+	--with-sys-screenrc=/etc/screenrc \
 	--with-pty-mode=0620 \
 	--with-pty-group=5 \
 	--disable-socket-dir
@@ -155,8 +155,11 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/screen/utf8encodings} \
 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
+
+install etc/etcscreenrc $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+echo -e "\n\n" >> $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+cat %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
+
 cp -a utf8encodings/* $RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/screen
 
@@ -177,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 %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/*