add ipv6 bcond

[packages/screen.git] / screen.spec

diff --git a/screen.spec b/screen.spec
index cd4c5059421223e4af42c113e2bf5a6a4a4331c9..bc901920fab60d91466bd594fcaf784aec64d06a 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -1,6 +1,9 @@
+# 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
+%bcond_without ipv6            # enable/disable IPv6 patch
 
 # TODO
 # - from changelog: 'maxwin' can now be used to increase the number of maximum windows.
@@ -14,40 +17,31 @@ 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:       3
+Version:       4.3.1
+Release:       1
 License:       GPL v3+
 Group:         Applications/Terminal
-Source0:       http://git.savannah.gnu.org/cgit/screen.git/snapshot/%{name}-cbaa666d4f21988164068a38ac915f8b4f3c4da3.tar.gz
-# Source0-md5: ce736c486b6cd4d7167ae6dae5e3103c
+Source0:       http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
+# Source0-md5: 5bb3b0ff2674e29378c31ad3411170ad
 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
 Patch5:                %{name}-debian_fixed.patch
-Patch6:                %{name}-nolibtermcap.patch
 Patch7:                %{name}-no_hardcoded_term_sequences.patch
 Patch8:                %{name}-home_etc.patch
 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
-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
+Patch16:       %{name}-ipv6.patch
+Patch17:       %{name}-E3.patch
+Patch18:       %{name}-4.1.0-suppress_remap.patch
+Patch22:       52fix_%{name}_utf8_nfd.patch
+Patch24:       60-644788-%{name}-4.1.0-4.0.3-interoperability.patch
 URL:           http://www.gnu.org/software/screen/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,7 +50,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
@@ -113,34 +106,24 @@ Screen корисний користувачам, які заходять на 
 машиною.
 
 %prep
-%setup -qc
-mv screen-*/src/* .
-
-%patch1 -p0
-%patch2 -p0
+%setup -q
+%patch2 -p1
 %patch3 -p0
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 # DON'T ENABLE IT UNLESS YOU REALLY FIX IT
 # (it's heavily broken - note that some sequences should be get for
 # $TERM before running screen instance, and others for TERM=screen!)
 ###%patch7 -p1
 #%patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
 %patch12 -p1
 #%patch13 -p1 # my brain farted here, see if you have better luck
 %patch15 -p0
-%patch16 -p2
+%{?with_ipv6:%patch16 -p2}
 %patch17 -p2
 %patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
 %patch22 -p1
-%patch23 -p1
 %patch24 -p1
 
 %build
@@ -183,12 +166,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