- add xterm-color

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index bffb029f5e7bda682cab0a0b580084757a4a62f7..4b4d8a348a31665d9773bca2bb9914b9a1811d2e 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,17 +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.0.3
-Release:       4
-License:       GPL
+Version:       4.1.0
+Release:       1.2
+License:       GPL v3+
 Group:         Applications/Terminal
-Source0:       ftp://ftp.uni-erlangen.de/pub/utilities/screen/%{name}-%{version}.tar.gz
-# Source0-md5: 8506fd205028a96c741e4037de6e3c42
+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
-Patch0:                %{name}-tty.patch
+Source3:       %{name}rc
 Patch1:                %{name}-compat21.patch
 Patch2:                %{name}-manual.patch
 Patch3:                %{name}-ia64.patch
@@ -31,6 +39,8 @@ Patch9:               %{name}-no-libs.patch
 Patch10:       %{name}-varargs.patch
 Patch11:       %{name}-inputline-size.patch
 Patch12:       %{name}-screenrc.patch
+Patch13:       %{name}-osc.patch
+Patch15:       %{name}-statusline-encoding.patch
 URL:           http://www.gnu.org/software/screen/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -95,8 +105,9 @@ Screen корисний користувачам, які заходять на 
 машиною.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -qc
+mv screen-*/src/* .
+
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
@@ -112,22 +123,25 @@ Screen корисний користувачам, які заходять на 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+#%patch13 -p1 # my brain farted here, see if you have better luck
+%patch15 -p0
 
 %build
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
+CFLAGS="%{rpmcflags} -DMAXWIN=256"
+%{?with_fifo:nore=1} \
 %configure \
-       --with-sys-screenrc=%{_sysconfdir}/screenrc \
        --enable-pam \
        --enable-colors256 \
+       --enable-rxvt_osc \
+       --with-sys-screenrc=/etc/screenrc \
+       --with-pty-mode=0620 \
+       --with-pty-group=5 \
        --disable-socket-dir
 
-for file in *.dist; do
-       cp -f $file ${file%.dist}
-done
-
-%{__make} \
-       CFLAGS="%{rpmcflags} -DMAXWIN=128"
+%{__make} -j1
 
 cd doc
 rm -f screen.info*
@@ -138,15 +152,18 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/screen/utf8encodings} \
        $RPM_BUILD_ROOT{/etc/{skel,pam.d},%{_mandir}/{,pl}/man1,%{_infodir}}
 
-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
-install utf8encodings/*                $RPM_BUILD_ROOT%{_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}
+
+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
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-install %{SOURCE2}             $RPM_BUILD_ROOT/etc/pam.d/screen
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.screen-non-english-man-pages
 
 %clean
@@ -162,11 +179,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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(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/*
 %{_infodir}/screen.info*
-%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*