- merged screen-status-bar.patch into screen-screenrc.patch

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index c4dd398364ac6968a4733df621025eedf30a671f..0fe3981bc16113c62b27fcdc64854165969335e4 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,7 +1,3 @@
-
-# Conditional build:                                                                                               
-%bcond_without status_bar  # do not add status bar options to /etc/screenrc
-
 Summary:       Screen - Manages multiple sessions on one tty
 Summary(de):   Screen - Verwaltet mehrere Sitzungen an einem tty
 Summary(es):   Screen - Administra múltiples sesiones en un tty
@@ -12,15 +8,16 @@ Summary(ru): 
 Summary(tr):   Bir uçbirimde birden fazla oturumu düzenler
 Summary(uk):   íÅÎÅÄÖÅÒ ÅËÒÁÎÕ, ÝÏ Ð¦ÄÔÒÉÍÕ¤ ˦ÌØËÁ ÌÏÇ¦Î¦× Ú ÏÄÎÏÇÏ ÔÅÒͦÎÁÌÕ
 Name:          screen
-Version:       4.0.2
-Release:       4
+Version:       4.0.3
+Release:       3
 License:       GPL
 Group:         Applications/Terminal
 Source0:       ftp://ftp.uni-erlangen.de/pub/utilities/screen/%{name}-%{version}.tar.gz
-# Source0-md5: ed68ea9b43d9fba0972cb017a24940a1
+# Source0-md5: 8506fd205028a96c741e4037de6e3c42
 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
 Patch1:                %{name}-compat21.patch
 Patch2:                %{name}-manual.patch
@@ -32,8 +29,9 @@ Patch7:               %{name}-no_hardcoded_term_sequences.patch
 Patch8:                %{name}-home_etc.patch
 Patch9:                %{name}-no-libs.patch
 Patch10:       %{name}-varargs.patch
-Patch11:       %{name}-status-bar.patch
-URL:           http://www.gnu.org/software/screen/ 
+Patch11:       %{name}-inputline-size.patch
+Patch12:       %{name}-screenrc.patch
+URL:           http://www.gnu.org/software/screen/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: ncurses-devel >= 5.0
@@ -112,7 +110,8 @@ Screen 
 #%patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%{?with_status_bar:%patch11 -p1}
+%patch11 -p1
+%patch12 -p1
 
 %build
 %{__aclocal}
@@ -124,12 +123,11 @@ Screen 
        --disable-socket-dir
 
 for file in *.dist; do
-filenew=$(echo "$file" | sed -e 's#\.dist##g')
-       cp -f $file $filenew
+       cp -f $file ${file%.dist}
 done
 
 %{__make} \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags} -DMAXWIN=128"
 
 cd doc
 rm -f screen.info*
@@ -144,11 +142,12 @@ 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 etc/screenrc           $RPM_BUILD_ROOT/etc/skel/.screenrc
+install %{SOURCE3}     $RPM_BUILD_ROOT/etc/skel/.screenrc
 install utf8encodings/*                $RPM_BUILD_ROOT%{_datadir}/screen/utf8encodings
 
 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
 rm -rf $RPM_BUILD_ROOT
@@ -161,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog doc/{FAQ,README.DOTSCREEN}
+%doc NEWS README ChangeLog doc/{FAQ,README.DOTSCREEN} etc/screenrc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/screenrc
 %attr(755,root,root) %{_bindir}/screen
 %{_datadir}/screen
@@ -170,4 +169,4 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %{_infodir}/screen.info*
-%config(noreplace) %verify(not size mtime md5) /etc/pam.d/*
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*