[byobu] added various upstream patches

[Jan Klepek]

commit 17f12e52a9dd21162f3d2eb569aff36731edd21d
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Wed Feb 26 21:22:26 2014 +0100

    added various upstream patches

 byobu-5.73-bash.patch      |   12 ++++++++++++
 byobu-5.73-logo.patch      |   11 +++++++++++
 byobu-5.73-tmux_date.patch |   11 +++++++++++
 byobu.spec                 |   16 +++++++++++++++-
 4 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/byobu-5.73-bash.patch b/byobu-5.73-bash.patch
new file mode 100644
index 0000000..341fb8a
--- /dev/null
+++ b/byobu-5.73-bash.patch
@@ -0,0 +1,12 @@
+--- 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-logo.patch b/byobu-5.73-logo.patch
new file mode 100644
index 0000000..350871e
--- /dev/null
+++ b/byobu-5.73-logo.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..83e03eb
--- /dev/null
+++ b/byobu-5.73-tmux_date.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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 message-bg $BYOBU_ACCENT
+ set -g message-fg white
+ 
diff --git a/byobu.spec b/byobu.spec
index 8766900..eeb9ac0 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -6,7 +6,7 @@
 
 Name:		byobu
 Version:	5.73
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -15,6 +15,12 @@ URL:		http://launchpad.net/byobu
 Source0:	http://code.launchpad.net/byobu/trunk/%{version}/+download/byobu_%{version}.orig.tar.gz
 # default windows
 Source1:	fedoracommon
+# patch for wrong logo on RHEL, https://bugs.launchpad.net/byobu/+bug/1278006
+Patch0:		byobu-5.73-logo.patch
+# patch for incorrect shell detection, https://bugs.launchpad.net/byobu/+bug/1280550 
+Patch1:		byobu-5.73-bash.patch
+# patch for "hard" date/time, https://bugs.launchpad.net/byobu/+bug/1284392
+Patch2:		byobu-5.73-tmux_date.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}%{?fedora} > 5
@@ -47,6 +53,11 @@ for i in `grep -Ri BYOBU_PREFIX/lib/ * | awk -F: '{print $1}' | uniq`; do
 sed -i "s#BYOBU_PREFIX/lib/#BYOBU_PREFIX/libexec/#g" $i;
 done
 
+# apply patches
+%patch0
+%patch1
+%patch2
+
 # fix path for correct directory in /usr/share
 sed -i "s#DOC = BYOBU_PREFIX + '/share/doc/' + PKG#DOC='%{_pkgdocdir}'#g" usr/lib/byobu/include/config.py
 
@@ -122,6 +133,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Wed Feb 26 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-2
+- various upstream patches
+
 * Tue Feb 18 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-1
 - Update to latest release