From 3c5b60b94da40489bc7ec774d5520e6d664ff9e8 Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek@gmail.com>
Date: Feb 27 2014 17:52:48 +0000
Subject: Merge branch 'master' into el5


---

diff --git a/byobu-5.73-tmuxrc_source.patch b/byobu-5.73-tmuxrc_source.patch
new file mode 100644
index 0000000..7dc37fb
--- /dev/null
+++ b/byobu-5.73-tmuxrc_source.patch
@@ -0,0 +1,7 @@
+--- 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/byobu.spec b/byobu.spec
index 1e9c1e7..b3cb92d 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -6,7 +6,7 @@
 
 Name:		byobu
 Version:	5.73
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -21,6 +21,8 @@ Patch0:		byobu-5.73-logo.patch
 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
+# patch for multiple sourcing, https://bugs.launchpad.net/byobu/+bug/1273685
+Patch3:		byobu-5.73-tmuxrc_source.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}%{?fedora} > 5
@@ -57,6 +59,7 @@ done
 %patch0
 %patch1
 %patch2
+%patch3
 
 # 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
@@ -133,6 +136,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Thu Feb 27 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-3
+- various upstream patches
+
 * Wed Feb 26 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-2
 - various upstream patches