- rel 2; switch back to fifos (like in screen 4.0); add backward compat patch that...

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index ff280ade4e726c62de9e16ef7aece3f22e922c32..cc2c43da06880bf2a238371a56aa653f2295704d 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,12 +1,9 @@
 #
 # Conditional build:
-%bcond_with    fifo            # force using fifos even if sockets detected
+%bcond_without 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.
+# - from changelog: 'maxwin' can now be used to increase the number of maximum windows.
 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
@@ -17,16 +14,17 @@ Summary(ru.UTF-8):  Менеджер экрана, поддерживающий 
 Summary(tr.UTF-8):     Bir uçbirimde birden fazla oturumu düzenler
 Summary(uk.UTF-8):     Менеджер екрану, що підтримує кілька логінів з одного терміналу
 Name:          screen
+# 4.0 stable is on SCREEN_4_0 brach
 Version:       4.1.0
-Release:       0.7
+Release:       2
 License:       GPL v3+
 Group:         Applications/Terminal
-Source0:       http://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-a805439f6443fb0e00ac6caff92f99950c1ddda8.tar.gz
-# Source0-md5: fa1677dfd3880772b4bc5a3aa598f4fe
+Source0:       http://git.savannah.gnu.org/cgit/screen.git/snapshot/%{name}-cbaa666d4f21988164068a38ac915f8b4f3c4da3.tar.gz
+# Source0-md5: 8acbe428e5d3071c20c3981183009b73
 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,6 +39,15 @@ Patch11:     %{name}-inputline-size.patch
 Patch12:       %{name}-screenrc.patch
 Patch13:       %{name}-osc.patch
 Patch15:       %{name}-statusline-encoding.patch
+Patch16:       screen-ipv6.patch
+Patch17:       screen-E3.patch
+Patch18:       screen-4.1.0-suppress_remap.patch
+Patch19:       49long-usernames.patch
+Patch20:       50increase-max-TERM-length.patch
+Patch21:       51fix-utf8-status-padding-bug.patch
+Patch22:       52fix_screen_utf8_nfd.patch
+Patch23:       53fix-startup-race-condition.patch
+Patch24:       60-644788-screen-4.1.0-4.0.3-interoperability.patch
 URL:           http://www.gnu.org/software/screen/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -49,6 +56,7 @@ BuildRequires:        pam-devel
 BuildRequires: texinfo
 BuildRequires: utempter-devel
 Requires:      pam >= 0.77.3
+Requires:      systemd-units >= 38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -125,17 +133,29 @@ mv screen-*/src/* .
 %patch12 -p1
 #%patch13 -p1 # my brain farted here, see if you have better luck
 %patch15 -p0
+%patch16 -p2
+%patch17 -p2
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-CFLAGS="%{rpmcflags} -DMAXWIN=128"
+# --enable-locale vs --enable-use-locale - https://savannah.gnu.org/bugs/index.php?37528
+CFLAGS="%{rpmcflags} -DMAXWIN=256"
 %{?with_fifo:nore=1} \
 %configure \
        --enable-pam \
        --enable-colors256 \
        --enable-rxvt_osc \
+       --enable-telnet \
+       --enable-use-locale \
        --with-sys-screenrc=/etc/screenrc \
        --with-pty-mode=0620 \
        --with-pty-group=5 \
@@ -155,8 +175,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 +200,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/*