diff --git a/screen-4.1.0-reattach.patch b/screen-4.1.0-reattach.patch new file mode 100644 index 0000000..db67c2d --- /dev/null +++ b/screen-4.1.0-reattach.patch @@ -0,0 +1,13 @@ +diff --git a/src/screen.c b/src/screen.c +index af0fd82..cd0c71b 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -1005,7 +1005,7 @@ char **av; + Panic(0, "$HOME too long - sorry."); + + attach_tty = ""; +- if (!detached && !lsflag && !cmdflag && !(dflag && !mflag && !rflag && !xflag) && !(!mflag && !SockMatch && sty && !xflag)) ++ if (!detached && !lsflag && !cmdflag && !(dflag && !mflag && !rflag && !xflag) && !(!mflag && !SockMatch && sty && !xflag && !rflag)) + { + #ifndef NAMEDPIPE + int fl; diff --git a/screen.spec b/screen.spec index 27b6a69..80d40ac 100644 --- a/screen.spec +++ b/screen.spec @@ -3,7 +3,7 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.1.0 -Release: 0.8.20120314git3c2946%{?dist} +Release: 0.9.20120314git3c2946%{?dist} License: GPLv2+ Group: Applications/System URL: http://www.gnu.org/software/screen @@ -25,6 +25,7 @@ Patch3: screen-ipv6.patch Patch4: screen-cc.patch Patch5: screen-E3.patch Patch6: screen-4.1.0-suppress_remap.patch +Patch7: screen-4.1.0-reattach.patch %description The screen utility allows you to have multiple logins on just one @@ -44,6 +45,7 @@ support multiple logins on one terminal. %patch4 -p2 -b .cc %patch5 -p2 -b .E3 %patch6 -p1 -b .suppress_remap +%patch7 -p2 -b .reattach %build @@ -140,6 +142,9 @@ fi %endif %changelog +* Wed Mar 28 2012 Lukáš Nykrýn - 4.1.0-0.9.20120314git3c2946 +- fix for resuming screen in screen (#752622) + * Wed Mar 14 2012 Lukáš Nykrýn - 4.1.0-0.8.20120314git3c2946 - rebase to latest git snapshot - fix a crash when switching from altscreen after window resize (#784504)