hpejakle pushed to byobu (f21). "Merge branch 'epel7' with master"

[notifications at fedoraproject.org]

>From bb848dc87ddf81cb86d11b4561aa8c138c4a40ed Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek at gmail.com>
Date: Tue, 11 Nov 2014 17:05:42 -0500
Subject: update to 5.87


diff --git a/.gitignore b/.gitignore
index b535e83..50d5dfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ byobu_2.80.orig.tar.gz
 /byobu_5.21.orig.tar.gz
 /byobu_5.69.orig.tar.gz
 /byobu_5.73.orig.tar.gz
+/byobu_5.87.orig.tar.gz
diff --git a/byobu-5.73-bash.patch b/byobu-5.73-bash.patch
deleted file mode 100644
index 341fb8a..0000000
--- a/byobu-5.73-bash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- usr/share/byobu/profiles/bashrc
-+++ usr/share/byobu/profiles/bashrc
-@@ -24,7 +24,7 @@ case "$TERM" in
- esac
- if [ -n "$TMUX" ] || [ "${TERMCAP#*screen}" != "${TERMCAP}" ]; then
- 	# Ensure that we're in bash, in a byobu environment
--	if [ -n "$BYOBU_BACKEND" ] && [ "$SHELL" = "/bin/bash" ]; then
-+	if [ -n "$BYOBU_BACKEND" ] && [ -n "$BASH" ]; then
- 		byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e "$e "; }
- 		case "$BYOBU_DISTRO" in
- 			"Ubuntu")
--- 
diff --git a/byobu-5.73-config_except.patch b/byobu-5.73-config_except.patch
deleted file mode 100644
index fac5b0a..0000000
--- a/byobu-5.73-config_except.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr/lib/byobu/include/config.py.old	2014-02-28 18:10:06.262946167 +0100
-+++ usr/lib/byobu/include/config.py	2014-02-28 18:30:45.862109401 +0100
-@@ -212,10 +212,16 @@
- 		status[i[1]] = i[0]
- 	for key in ["tmux_left", "tmux_right", "screen_upper_left", "screen_upper_right", "screen_lower_left", "screen_lower_right"]:
- 		if key.startswith(BYOBU_BACKEND):
--			f = open(path, "r")
-+			try:
-+				f = open(path, "r")
-+		 	except:
-+				f = open(SHARE + '/status/status', "r")
- 			lines = f.readlines()
- 			f.close()
--			f = open(path, "w")
-+			try:
-+				f = open(path, "w")
-+			except:
-+				f = open(path, "a+")
- 			for l in lines:
- 				if l.startswith("%s=" % key):
- 					val = genstatusstring(key, status)
diff --git a/byobu-5.73-logo.patch b/byobu-5.73-logo.patch
deleted file mode 100644
index 350871e..0000000
--- a/byobu-5.73-logo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- usr/lib/byobu/logo	2013-09-26 20:20:38.000000000 +0200
-+++ usr/lib/byobu/logo	2014-02-26 20:42:51.722184482 +0100
-@@ -99,7 +99,7 @@
- 			logo=" lm "
- 			$MARKUP && printf "$(color g w)$logo$(color -)$(color g w)$(color -) " || printf "$logo"
- 		;;
--		*red*hat*)
-+		*red*hat*|*rhel*)
- 			logo=" RH "
- 			$MARKUP && printf "$(color R k)%s$(color -)" "$logo" || printf "$logo"
- 		;;
diff --git a/byobu-5.73-tmux_date.patch b/byobu-5.73-tmux_date.patch
index 83e03eb..2d12588 100644
--- a/byobu-5.73-tmux_date.patch
+++ b/byobu-5.73-tmux_date.patch
@@ -1,11 +1,10 @@
---- usr/share/byobu/profiles/tmux	2014-02-09 14:11:41.000000000 +0100
-+++ usr/share/byobu/profiles/tmux	2014-02-26 21:04:28.369077858 +0100
-@@ -85,7 +85,7 @@
+--- usr/share/byobu/profiles/tmux	2014-11-11 16:38:31.339946510 -0500
++++ usr/share/byobu/profiles/tmux.old	2014-11-11 16:38:23.342593025 -0500
+@@ -86,6 +86,6 @@
  set -g status-left-length 256
  set -g status-right-length 256
  set -g status-left '#(byobu-status tmux_left)'
--set -g status-right '#(byobu-status tmux_right)'$BYOBU_DATE$BYOBU_TIME
 +set -g status-right '#(byobu-status tmux_right)'
+-set -g status-right '#(byobu-status tmux_right)'$BYOBU_DATE$BYOBU_TIME
  set -g message-bg $BYOBU_ACCENT
  set -g message-fg white
- 
diff --git a/byobu-5.73-tmuxrc_source.patch b/byobu-5.73-tmuxrc_source.patch
deleted file mode 100644
index 7dc37fb..0000000
--- a/byobu-5.73-tmuxrc_source.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- usr/share/byobu/profiles/tmuxrc      2014-02-09 15:05:00.000000000 +0100
-+++ usr/share/byobu/profiles/tmuxrc  2014-02-27 10:32:11.000896701 +0100
-@@ -26,4 +26,3 @@
- source-file $HOME/.byobu/datetime.tmux
- source-file $BYOBU_CONFIG_DIR/profile.tmux
- source-file $BYOBU_CONFIG_DIR/keybindings.tmux
--source-file $BYOBU_CONFIG_DIR/.tmux.conf
diff --git a/sources b/sources
index ee39e7b..ac25808 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d0e546b1f2b8e3c08e06c931b25e665  byobu_5.73.orig.tar.gz
+85c24ab9f82f354f6f28e70870102dfb  byobu_5.87.orig.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/byobu.git/commit/?h=f21&id=93cebf33840013b7ce6ef8a04f5898524cf7895e