- updated to 4.6.1

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index 66581bb1d7777e47b70d16b23e2d012143b6259c..72d514753d02265c75b34424bad6d804e6e7bb4f 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,9 +1,3 @@
-# TODO: check interoperability with 4.0.x and 4.1.x (or don't care about it):
-# 4.2.1 string buffer sizes are enlargered upstream, but to different values than Debian's 4.1.x
-#
-# Conditional build:
-%bcond_without fifo            # force using fifos even if sockets detected
-
 # TODO
 # - from changelog: 'maxwin' can now be used to increase the number of maximum windows.
 Summary:       Screen - Manages multiple sessions on one tty
@@ -16,17 +10,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.2.1
+Version:       4.6.1
 Release:       1
 License:       GPL v3+
 Group:         Applications/Terminal
 Source0:       http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
-# Source0-md5: 419a0594e2b25039239af8b90eda7d92
+# Source0-md5: 132c893aabfaf2020074790215c8cacd
 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:       %{name}rc
-Patch1:                %{name}-compat21.patch
 Patch2:                %{name}-manual.patch
 Patch3:                %{name}-ia64.patch
 Patch4:                %{name}-info.patch
@@ -37,13 +30,11 @@ Patch9:             %{name}-no-libs.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
-Patch22:       52fix_screen_utf8_nfd.patch
-Patch24:       60-644788-screen-4.1.0-4.0.3-interoperability.patch
+Patch17:       %{name}-E3.patch
+Patch18:       %{name}-4.1.0-suppress_remap.patch
+Patch22:       52fix_%{name}_utf8_nfd.patch
 URL:           http://www.gnu.org/software/screen/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: pam-devel
@@ -107,7 +98,6 @@ Screen корисний користувачам, які заходять на 
 
 %prep
 %setup -q
-%patch1 -p0
 %patch2 -p1
 %patch3 -p0
 %patch4 -p1
@@ -120,12 +110,10 @@ Screen корисний користувачам, які заходять на 
 %patch9 -p1
 %patch12 -p1
 #%patch13 -p1 # my brain farted here, see if you have better luck
-%patch15 -p0
-%patch16 -p2
+%patch15 -p1
 %patch17 -p2
 %patch18 -p1
 %patch22 -p1
-%patch24 -p1
 
 %build
 %{__aclocal}
@@ -133,7 +121,6 @@ Screen корисний користувачам, які заходять на 
 %{__autoconf}
 # --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 \
@@ -145,13 +132,6 @@ 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
@@ -167,12 +147,12 @@ 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
+cp -p 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
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/screen
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.screen-non-english-man-pages
@@ -190,10 +170,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/*
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/screen
 %attr(755,root,root) %{_bindir}/screen
 %{_datadir}/screen
-%{_mandir}/man1/*
-%lang(ja) %{_mandir}/ja/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/screen.1*
+%lang(ja) %{_mandir}/ja/man1/screen.1*
+%lang(pl) %{_mandir}/pl/man1/screen.1*
 %{_infodir}/screen.info*