From cb3201c709a15bcb0afaacf34fc731d5a5b93531 Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek@gmail.com>
Date: Aug 01 2011 21:14:08 +0000
Subject: update to 4.23


---

diff --git a/.gitignore b/.gitignore
index 3aff64b..30677ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ byobu_2.80.orig.tar.gz
 /byobu_3.20.orig.tar.gz
 /byobu_3.21.orig.tar.gz
 /byobu_4.22.orig.tar.gz
+/byobu_4.23.orig.tar.gz
diff --git a/byobu.spec b/byobu.spec
index 01813d3..e1797af 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -1,6 +1,6 @@
 Name:		byobu
-Version:	4.22
-Release:	2%{?dist}
+Version:	4.23
+Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -9,11 +9,6 @@ URL:		http://launchpad.net/byobu
 Source0:	http://code.launchpad.net/byobu/trunk/%{version}/+download/byobu_%{version}.orig.tar.gz
 # default windows
 Source1:	fedoracommon
-# fix for https://bugs.launchpad.net/byobu/+bug/815579
-Patch0:		byobu_updates.patch
-
-# removed words Ubuntu from MOTD
-Patch1:		byobu_byobu-shell.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}%{?fedora} > 5
@@ -35,8 +30,8 @@ such as toggle-able system status notifications.
 
 %prep
 %setup -q
-%patch0 
-%patch1
+# remove swap file
+rm usr/bin/.byobu-status-print.swp
 # fix path for lib directory in scripts
 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;
@@ -98,6 +93,9 @@ rm -rf %{buildroot}
 %{_libexecdir}/%{name}/.shutil
 
 %changelog
+* Mon Aug 1 2011 Jan Klepek <jan.klepek at, gmail.com> - 4.23-1
+- update to 4.23
+
 * Sat Jul 23 2011 Jan Klepek <jan.klepek at, gmail.com> - 4.22-2
 - updated to 4.22 + various bugfixes
 
diff --git a/byobu_byobu-shell.patch b/byobu_byobu-shell.patch
deleted file mode 100644
index 590ea14..0000000
--- a/byobu_byobu-shell.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- usr/bin/byobu-shell	2011-07-24 12:08:13.952856847 +0200
-+++ usr/bin/byobu-shell	2011-07-24 21:12:37.182934145 +0200
-@@ -27,12 +27,15 @@
- 
- if [ ! -e "$FLAG" ]; then
- 	echo
--	echo "Welcome to Ubuntu's powerful, text-based window manager, Byobu."
-+	echo "Welcome to powerful, text-based window manager, Byobu."
- 	echo "You can toggle the launch of Byobu at login with:"
- 	echo "  'byobu-disable' and 'byobu-enable'"
- 	echo
- 	echo "For tips, tricks, and more information, see:"
- 	echo " * https://help.ubuntu.com/community/Byobu"
-+	echo ""
-+	echo "Please report any bug in Fedora Bugzilla system"
-+	echo "* https://bugzilla.redhat.com"
- 	echo
- 	touch "$FLAG"
- fi
diff --git a/byobu_updates.patch b/byobu_updates.patch
deleted file mode 100644
index d08d230..0000000
--- a/byobu_updates.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- usr/lib/byobu/updates_available.old	2011-07-24 12:47:09.348399496 +0200
-+++ usr/lib/byobu/updates_available	2011-07-24 13:04:49.087807911 +0200
-@@ -44,7 +44,11 @@
- 	# These are very computationally intensive processes.
- 	# Background this work, have it write to the cache files,
- 	# and let the next cache check pick up the results.
--	if [ -x /usr/lib/update-notifier/apt-check ]; then
-+    # packagekit should be available almost everywhere nowadays
-+    if command -v pkcon >/dev/null; then
-+        # use packagekit to show list of packages
-+		pkcon get-updates -p | grep -E '^Package' | wc -l > "$mycache" &
-+	elif [ -x /usr/lib/update-notifier/apt-check ]; then
- 		# If apt-check binary exists, use it
- 		/usr/lib/update-notifier/apt-check 2>&1 | awk '-F;' 'END { print $1, $2 }' > "$mycache" &
- 	elif command -v apt-get >/dev/null; then
-@@ -69,6 +73,10 @@
- 	mycache=$1
- 	# The cache doesn't exist: create it
- 	[ ! -e "$mycache" ] && return 0
-+    # packagekit support
-+    if -e /var/lib/PackageKit/transactions.db; then
-+		[ "/var/lib/PackageKit/transactions.db" -nt "$mycache" ] && return 0
-+	fi
- 	if command -v apt-get >/dev/null; then
- 		# Debian/ubuntu
- 		[ "/var/lib/apt" -nt "$mycache" ] || [ "/var/lib/apt/lists" -nt "$mycache" ]
-@@ -83,8 +91,13 @@
- 	return 1
- }
- 
-+# show name of available update packages
-+
- __updates_available_detail() {
--	if command -v apt-get >/dev/null; then
-+	if command pkcon >/dev/null; then
-+		detail=`pkcon get-updates -p | grep -E '^Package'`
-+        printf "$detail"
-+	elif command -v apt-get >/dev/null; then
- 		detail=`apt-get -s -o Debug::NoLocking=true upgrade`
- 		if [ "$1" = "--detail" ]; then
- 			printf "$detail"
diff --git a/sources b/sources
index e2d1af4..bf1bd51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3c0e9b32e960a7497d7f918c25fbd50  byobu_4.22.orig.tar.gz
+f536dae64d520c11137adf2403cba8e4  byobu_4.23.orig.tar.gz