- append our config to dist one

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index 0e5bbfb0a9d922b6be5d32dc3ae8403eb7aa673c..23e898bd30dd0e78f46fb3a022bf1b21fc5f540d 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,3 +1,12 @@
+#
+# Conditional build:
+%bcond_with    fifo            # force using fifos even if sockets detected
+
+# TODO
+# - should we switch back fifos forcibly (so you could resume 4.0 sessions with 4.1?, stalled for me anyway)
+#   configure: checking socket implementation...
+#   - you are normal
+#   - both sockets and fifos usable. let's take sockets.
 Summary:       Screen - Manages multiple sessions on one tty
 Summary(de.UTF-8):     Screen - Verwaltet mehrere Sitzungen an einem tty
 Summary(es.UTF-8):     Screen - Administra múltiples sesiones en un tty
@@ -8,12 +17,12 @@ 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.4
-License:       GPL
+Version:       4.1.0
+Release:       1.1
+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/screen-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
@@ -32,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
@@ -123,10 +131,12 @@ mv screen-*/src/* .
 %{__autoheader}
 %{__autoconf}
 CFLAGS="%{rpmcflags} -DMAXWIN=128"
+%{?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
@@ -145,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
 
@@ -167,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/*