- rel 4; up to 20130513

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index 0ae53f803909505b20ee2de91edb9399fe325b0a..5f8724ad1d729f1250ecf7a208f265e898ebfd17 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,12 +1,8 @@
 #
 # 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
@@ -20,11 +16,11 @@ Summary(uk.UTF-8):  Менеджер екрану, що підтримує кіл
 Name:          screen
 # 4.0 stable is on SCREEN_4_0 brach
 Version:       4.1.0
-Release:       1.5
+Release:       4
 License:       GPL v3+
 Group:         Applications/Terminal
-Source0:       http://git.savannah.gnu.org/cgit/screen.git/snapshot/%{name}-cbaa666d4f21988164068a38ac915f8b4f3c4da3.tar.gz
-# Source0-md5: 8acbe428e5d3071c20c3981183009b73
+Source0:       http://git.savannah.gnu.org/cgit/screen.git/snapshot/%{name}-c2cd05962664c80f8ae063d6bf7a21084e0c2f37.tar.gz
+# Source0-md5: 61195697c98359ae3a86c8e1ea5f538d
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 236166e774cee788cf594b05dd1dd70d
 Source2:       %{name}.pamd
@@ -46,6 +42,12 @@ 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
@@ -54,7 +56,6 @@ 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
@@ -134,6 +135,12 @@ mv screen-*/src/* .
 %patch16 -p2
 %patch17 -p2
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 %{__aclocal}
@@ -153,6 +160,13 @@ CFLAGS="%{rpmcflags} -DMAXWIN=256"
        --with-pty-group=5 \
        --disable-socket-dir
 
+%if %{with fifo}
+if ! grep -q "define.*NAMEDPIPE.*1" config.h; then
+       echo "bcond with fifo but fifos not enabled!"
+       exit 1
+fi
+%endif
+
 %{__make} -j1
 
 cd doc