hpejakle pushed to byobu (el6). "Merge branch 'master' into el6"

Sat Mar 28 14:01:59 UTC 2015

>From 8e6f4fb7f5eac7965bcbb794a9c5c63330cf061a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Fri, 6 Jun 2014 22:45:38 -0500
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

diff --git a/byobu.spec b/byobu.spec
index d5df46c..47d317a 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -6,7 +6,7 @@
 
 Name:		byobu
 Version:	5.73
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -139,6 +139,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.73-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri Feb 28 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-4
 - patch for issue with missing ~/.byobu/status leading to crash in byobu-config
 
-- 
cgit v0.10.2


>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


>From 76a09ed76ae1f8234d01997821cb4dd0181ae172 Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek at gmail.com>
Date: Tue, 11 Nov 2014 17:10:42 -0500
Subject: update of spec


diff --git a/byobu.spec b/byobu.spec
index d5df46c..05402fd 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -5,8 +5,8 @@
 %define _iconsscaldir  %{_iconsbasedir}/scalable/apps
 
 Name:		byobu
-Version:	5.73
-Release:	4%{?dist}
+Version:	5.87
+Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -15,16 +15,8 @@ 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
-# patch for multiple sourcing, https://bugs.launchpad.net/byobu/+bug/1273685
-Patch3:		byobu-5.73-tmuxrc_source.patch
-# patch for crashing byobu-config, https://bugs.launchpad.net/byobu/+bug/1286249
-Patch4:		byobu-5.73-config_except.patch
+Patch0:		byobu-5.73-tmux_date.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}%{?fedora} > 5
@@ -50,22 +42,15 @@ such as toggle-able system status notifications.
 if [ -e "usr/bin/.byobu-status-print.swp" ]; then rm usr/bin/.byobu-status-print.swp
 fi
 # fix path for lib directory in scripts
-for i in `grep -Ri {BYOBU_PREFIX}/lib/ * | awk -F: '{print $1}' | uniq`; do
+for i in `find . -type f -exec grep -l {BYOBU_PREFIX}/lib/ {} \;`; do
 sed -i "s#{BYOBU_PREFIX}/lib/#{BYOBU_PREFIX}/libexec/#g" $i;
 done
-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
-%patch3
-%patch4
 
 # 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
+sed -i "s#DOC = BYOBU_PREFIX + '/share/doc/' + PKG#DOC='%{_pkgdocdir}'#g" usr/lib/byobu/include/config.py.in
 
 # set default fedora windows
 cp -p %{SOURCE1} usr/share/byobu/windows/common
@@ -104,7 +89,7 @@ cp -p usr/share/byobu/pixmaps/byobu.svg %{buildroot}%{_iconsscaldir}
 %find_lang %{name}
 
 %clean
-rm -rf %{buildroot}
+#rm -rf %{buildroot}
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -128,6 +113,9 @@ fi
 %{_iconsscaldir}/%{name}.svg
 %{_pkgdocdir}/*
 %{_bindir}/%{name}*
+%{_bindir}/col1
+%{_bindir}/ctail
+%{_bindir}/wifi-status
 %if 0%{?rhel} == 5
 %{_datadir}/applications/*.desktop
 %else
@@ -135,12 +123,15 @@ fi
 %endif
 %{_datadir}/%{name}/*
 %{_mandir}/man1/%{name}*.1.gz
+%{_mandir}/man1/col1.1.gz
+%{_mandir}/man1/ctail.1.gz
+%{_mandir}/man1/wifi-status.1.gz
 %{_libexecdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
-* Fri Feb 28 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-4
-- patch for issue with missing ~/.byobu/status leading to crash in byobu-config
+* Tue Nov 11 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.87-1
+- update to 5.87
 
 * Thu Feb 27 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.73-3
 - various upstream patches
-- 
cgit v0.10.2


>From 598879ad703e119c296c1869477f5eba076c594a Mon Sep 17 00:00:00 2001
From: Honza <hpejakle at localhost.localdomain>
Date: Sat, 28 Mar 2015 14:39:26 +0100
Subject: update to 5.92, fix for #1196950


diff --git a/.gitignore b/.gitignore
index 50d5dfb..f44ed17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ byobu_2.80.orig.tar.gz
 /byobu_5.69.orig.tar.gz
 /byobu_5.73.orig.tar.gz
 /byobu_5.87.orig.tar.gz
+/byobu_5.92.orig.tar.gz
diff --git a/byobu.spec b/byobu.spec
index 3a5dba1..9554d78 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -5,7 +5,7 @@
 %define _iconsscaldir  %{_iconsbasedir}/scalable/apps
 
 Name:		byobu
-Version:	5.87
+Version:	5.92
 Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
@@ -45,6 +45,11 @@ fi
 for i in `find . -type f -exec grep -l {BYOBU_PREFIX}/lib/ {} \;`; do
 sed -i "s#{BYOBU_PREFIX}/lib/#{BYOBU_PREFIX}/libexec/#g" $i;
 done
+# fix path for lib directory #2
+for i in `find . -type f -exec grep -l BYOBU_PREFIX/lib {} \;`; do
+sed -i "s#BYOBU_PREFIX/lib/#BYOBU_PREFIX/libexec/#g" $i;
+done
+
 
 # apply patches
 %patch0
@@ -130,6 +135,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Sat Mar 28 2015 Jan Klepek <jan.klepek at, gmail.com> - 5.92-1
+- update to 5.92, fix for #1196950
+
 * Tue Nov 11 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.87-1
 - update to 5.87
 
diff --git a/sources b/sources
index ac25808..f2c6957 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85c24ab9f82f354f6f28e70870102dfb  byobu_5.87.orig.tar.gz
+8fe94f12c1d2960523dba3b061bce051  byobu_5.92.orig.tar.gz
-- 
cgit v0.10.2


>From a5361a4a66e5c1e5551b80a397e009f6624767ed Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek at gmail.com>
Date: Sat, 28 Mar 2015 14:41:16 +0100
Subject: update to 5.92, fix for #1196950


diff --git a/.gitignore b/.gitignore
index 50d5dfb..f44ed17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ byobu_2.80.orig.tar.gz
 /byobu_5.69.orig.tar.gz
 /byobu_5.73.orig.tar.gz
 /byobu_5.87.orig.tar.gz
+/byobu_5.92.orig.tar.gz
diff --git a/byobu.spec b/byobu.spec
index 3a5dba1..9554d78 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -5,7 +5,7 @@
 %define _iconsscaldir  %{_iconsbasedir}/scalable/apps
 
 Name:		byobu
-Version:	5.87
+Version:	5.92
 Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
@@ -45,6 +45,11 @@ fi
 for i in `find . -type f -exec grep -l {BYOBU_PREFIX}/lib/ {} \;`; do
 sed -i "s#{BYOBU_PREFIX}/lib/#{BYOBU_PREFIX}/libexec/#g" $i;
 done
+# fix path for lib directory #2
+for i in `find . -type f -exec grep -l BYOBU_PREFIX/lib {} \;`; do
+sed -i "s#BYOBU_PREFIX/lib/#BYOBU_PREFIX/libexec/#g" $i;
+done
+
 
 # apply patches
 %patch0
@@ -130,6 +135,9 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Sat Mar 28 2015 Jan Klepek <jan.klepek at, gmail.com> - 5.92-1
+- update to 5.92, fix for #1196950
+
 * Tue Nov 11 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.87-1
 - update to 5.87
 
diff --git a/sources b/sources
index ac25808..f2c6957 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85c24ab9f82f354f6f28e70870102dfb  byobu_5.87.orig.tar.gz
+8fe94f12c1d2960523dba3b061bce051  byobu_5.92.orig.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/byobu.git/commit/?h=el6&id=a4461db6a16ad8a7a19cc95da735271d94eda3f9
