- updated to 4.7.0

- updated info,no-libs patches

diff --git a/screen-info.patch b/screen-info.patch
index a3cb768361d1a8e7bc0a0ce940a132f157c3990b..c0a80310b67ccd52e258beca72a3920954674296 100644 (file)
--- a/screen-info.patch
+++ b/screen-info.patch
@@ -1,7 +1,7 @@
---- screen-4.6.2/doc/screen.texinfo.orig       2017-10-23 14:18:26.000000000 +0200
-+++ screen-4.6.2/doc/screen.texinfo    2017-12-09 08:56:43.588104192 +0100
-@@ -3,14 +3,14 @@
- @c vi:set wm=5
+--- screen-4.7.0/doc/screen.texinfo.orig       2019-10-02 00:07:59.000000000 +0200
++++ screen-4.7.0/doc/screen.texinfo    2019-11-12 21:00:02.497808741 +0100
+@@ -4,14 +4,14 @@
+ @documentencoding ISO-8859-15
  @setfilename screen.info
  @settitle Screen User's Manual
 -@dircategory General Commands
@@ -9,7 +9,7 @@
  @finalout
  @setchapternewpage odd
  @c %**end of header
- @set version 4.6.2
+ @set version 4.7.0
  
  @direntry
 -* Screen: (screen).             Full-screen window manager.
@@ -17,7 +17,7 @@
  @end direntry
  
  @c For examples, use a literal escape in info.
-@@ -184,7 +184,7 @@
+@@ -185,7 +185,7 @@
  the invoking shell to the application (emacs in this case), because it is
  forked from the parent screen process, not from the invoking shell.
  
@@ -26,7 +26,7 @@
  will be written to this file for each window, and removed when the
  window is closed.  This is useful for working with @code{talk},
  @code{script}, @code{shutdown}, @code{rsend}, @code{sccs} and other
-@@ -496,7 +496,7 @@
+@@ -497,7 +497,7 @@
  @cindex screenrc
  When @code{screen} is invoked, it executes initialization commands from
  the files @file{.screenrc} in the user's home directory and
@@ -35,7 +35,7 @@
  following ways:
  For the global screenrc file @code{screen} searches for the environment
  variable @code{$SYSSCREENRC} (this override feature may be disabled at
-@@ -1035,7 +1035,7 @@
+@@ -1036,7 +1036,7 @@
  Place, where to dump hardcopy files.  @xref{Hardcopy}.
  @item hardstatus [@var{state}]
  Use the hardware status line.  @xref{Hardware Status Line}.
@@ -44,7 +44,7 @@
  Set display height.  @xref{Window Size}.
  @item help [-c @var{class}]
  Display current key bindings.  @xref{Help}.
-@@ -1088,7 +1088,7 @@
+@@ -1089,7 +1089,7 @@
  @item logfile @var{filename}
  Place where to collect logfiles.  @xref{Log}.
  @item login [@var{state}]
@@ -53,7 +53,7 @@
  @item logtstamp [@var{state}]
  Configure logfile time-stamps.  @xref{Log}.
  @item mapdefault
-@@ -1762,13 +1762,12 @@
+@@ -1763,13 +1763,12 @@
  @kindex C-x
  @deffn Command lockscreen
  (@kbd{C-a x}, @kbd{C-a C-x})@*
@@ -73,7 +73,7 @@
  
  Warning: When you leave other shells unlocked and have no password set
  on @code{screen}, the lock is void: One could easily re-attach from an
-@@ -2404,7 +2403,7 @@
+@@ -2405,7 +2404,7 @@
  * Naming Windows::            Control the name of the window
  * Console::                   See the host's console messages
  * Kill::                        Destroy an unwanted window
@@ -82,7 +82,7 @@
  * Mode::                        Control the file mode of the pty
  * Monitor::                     Watch for activity or inactivity in a window
  * Windows::                   List the active windows
-@@ -2613,7 +2612,7 @@
+@@ -2614,7 +2613,7 @@
  @kindex L
  @deffn Command login [state]
  (@kbd{C-a L})@*
@@ -126,18 +126,22 @@
  Login records
  
  @item @code{$LOCKPRG}
-@@ -5860,8 +5856,8 @@
+@@ -5860,10 +5856,10 @@
  ============
  
  @verbatim
+-     Maarten ter Huurne <maarten@treewalker.org>,
+-     Jussi Kukkonen <jussi.kukkonen@intel.com>,
 -     Thomas Renninger <treen@suse.com>,
 -     Axel Beckert <abe@deuxchevaux.org>,
++     Maarten ter Huurne <maarten@@treewalker.org>,
++     Jussi Kukkonen <jussi.kukkonen@@intel.com>,
 +     Thomas Renninger <treen@@suse.com>,
 +     Axel Beckert <abe@@deuxchevaux.org>,
       Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
       Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
       Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
-@@ -5945,10 +5941,10 @@
+@@ -5947,10 +5943,10 @@
  in order to be able to
  correctly change the owner of the tty device file for each window.
  Special permission may also be required to write the file
@@ -150,7 +154,7 @@
  with SIGKILL.  This will cause some programs (like "w" or "rwho") to
  advertise that a user is logged on who really isn't.
  
-@@ -6028,8 +6024,7 @@
+@@ -6030,8 +6026,7 @@
  @cindex socket directory
  
  The socket directory defaults either to @file{$HOME/.screen} or simply to 

diff --git a/screen-no-libs.patch b/screen-no-libs.patch
index 9d5de4c7fe091982b198945f60a09770e75c8a92..72406c9c37bbafcbb9ab24b881a637cbfb23352b 100644 (file)
--- a/screen-no-libs.patch
+++ b/screen-no-libs.patch
@@ -1,27 +1,14 @@
---- screen-4.1/configure.ac~   2010-02-24 14:49:45.000000000 +0200
-+++ screen-4.1/configure.ac    2010-02-24 14:51:15.206024475 +0200
-@@ -201,14 +201,6 @@
- #endif
- ], LIBS="$LIBS -lsocket -linet";seqptx=1)
- 
--oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
--AC_CHECKING(SVR4)
--AC_TRY_LINK([#include <utmpx.h>
--],,
--[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
--[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
--,LIBS="$oldlibs")
- AC_CHECK_HEADERS([stropts.h string.h strings.h])
- 
- AC_CHECKING(for Solaris 2.x)
-@@ -885,9 +877,6 @@
+--- screen-4.7.0/configure.ac.orig     2019-11-12 21:01:24.174032929 +0100
++++ screen-4.7.0/configure.ac  2019-11-12 21:02:55.326872445 +0100
+@@ -864,11 +864,6 @@
  dnl
  dnl    ****  loadav  ****
  dnl
+-if test "$cross_compiling" = no ; then
 -AC_CHECKING(for libutil(s))
 -test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
 -test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
+-fi
  
  AC_CHECKING(getloadavg)
  AC_TRY_LINK(,[getloadavg((double *)0, 0);],

diff --git a/screen.spec b/screen.spec
index afee0c5a67bd3d19ad3c3351431de7ffe6e0befa..edc73b4741816d084a8011249851f0cca3caf155 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -10,12 +10,12 @@ Summary(ru.UTF-8):  Менеджер экрана, поддерживающий 
 Summary(tr.UTF-8):     Bir uçbirimde birden fazla oturumu düzenler
 Summary(uk.UTF-8):     Менеджер екрану, що підтримує кілька логінів з одного терміналу
 Name:          screen
-Version:       4.6.2
+Version:       4.7.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/Terminal
-Source0:       http://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
-# Source0-md5: a0f529d3333b128dfaa324d978ba73a8
+Source0:       https://ftp.gnu.org/gnu/screen/%{name}-%{version}.tar.gz
+# Source0-md5: b8971ebd68d046f2814d1040cb8e6641
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 236166e774cee788cf594b05dd1dd70d
 Source2:       %{name}.pamd