From 50225d600709e50008796bc91035885ba557b1be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 1 Aug 2010 12:17:11 +0000 Subject: [PATCH] - up to 2010-06-22 snap, License is GPL v3+ Changed files: screen-etcscreenrc.patch -> 1.2 screen.spec -> 1.105 --- screen-etcscreenrc.patch | 11 ----------- screen.spec | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 screen-etcscreenrc.patch diff --git a/screen-etcscreenrc.patch b/screen-etcscreenrc.patch deleted file mode 100644 index eed167f..0000000 --- a/screen-etcscreenrc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- screen-4.1/Makefile.in~ 2010-02-24 08:36:22.000000000 +0200 -+++ screen-4.1/Makefile.in 2010-03-08 16:40:56.173597614 +0200 -@@ -25,7 +25,7 @@ - GIT_REV = "`git describe --always 2>/dev/null`" - DEFS = @DEFS@ -DGIT_REV=\"$(GIT_REV)\" - --ETCSCREENRC = $(prefix)/etc/screenrc -+ETCSCREENRC = /etc/screenrc - SCREENENCODINGS = $(datadir)/screen/utf8encodings - - CC = @CC@ diff --git a/screen.spec b/screen.spec index d49ba95..ff280ad 100644 --- a/screen.spec +++ b/screen.spec @@ -17,12 +17,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.1 -Release: 0.6 -License: GPL +Version: 4.1.0 +Release: 0.7 +License: GPL v3+ Group: Applications/Terminal -Source0: http://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-7851249fa3e5a9ce00ad3bf8bd0b417acb335f84.tar.gz -# Source0-md5: a1b42f6505230ecdb943d95231b3e358 +Source0: http://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-a805439f6443fb0e00ac6caff92f99950c1ddda8.tar.gz +# Source0-md5: fa1677dfd3880772b4bc5a3aa598f4fe Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 236166e774cee788cf594b05dd1dd70d Source2: %{name}.pamd @@ -41,7 +41,6 @@ Patch11: %{name}-inputline-size.patch Patch12: %{name}-screenrc.patch Patch13: %{name}-osc.patch Patch15: %{name}-statusline-encoding.patch -Patch16: %{name}-etcscreenrc.patch URL: http://www.gnu.org/software/screen/ BuildRequires: autoconf BuildRequires: automake @@ -137,6 +136,7 @@ CFLAGS="%{rpmcflags} -DMAXWIN=128" --enable-pam \ --enable-colors256 \ --enable-rxvt_osc \ + --with-sys-screenrc=/etc/screenrc \ --with-pty-mode=0620 \ --with-pty-group=5 \ --disable-socket-dir -- 2.44.0