From 0e8a48a83b996e8eaa27b1646dafe7f8446de790 Mon Sep 17 00:00:00 2001
From: Jan Klepek <jan.klepek@gmail.com>
Date: Jan 08 2011 11:58:15 +0000
Subject: Merge branch 'master' into f14


---

diff --git a/.gitignore b/.gitignore
index 55af8c5..55c686a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 byobu_2.80.orig.tar.gz
 /byobu_3.4.orig.tar.gz
+/byobu_3.20.orig.tar.gz
+/byobu_3.21.orig.tar.gz
diff --git a/byobu-status.patch b/byobu-status.patch
deleted file mode 100644
index 9a425a8..0000000
--- a/byobu-status.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /home/hpejakle/rpmbuild/SOURCES/byobu-3.4/usr/bin/byobu-status	2010-09-04 09:27:13.007359118 +0200
-+++ usr/bin/byobu-status	2010-09-04 09:42:29.225486596 +0200
-@@ -27,6 +27,8 @@
- 		echo "$HOME/.$PKG/bin/$1"
- 	elif [ -x "$BYOBU_PREFIX/lib/$PKG/$1" ]; then
- 		echo "$BYOBU_PREFIX/lib/$PKG/$1"
-+	elif [ -x "$BYOBU_PREFIX/libexec/$PKG/$1" ]; then
-+		echo "$BYOBU_PREFIX/libexec/$PKG/$1"
- 	else
- 		echo "/dev/null"
- 	fi
diff --git a/byobu.spec b/byobu.spec
index 7c5351f..6437e69 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -1,6 +1,6 @@
 Name:		byobu
-Version:	3.4
-Release:	2%{?dist}
+Version:	3.21
+Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -9,7 +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
-Patch0:		byobu-status.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}
@@ -31,7 +30,6 @@ such as toggle-able system status notifications.
 
 %prep
 %setup -q
-%patch0 -p0
 find . -name "Makefile*" | xargs rm -f
 # fix path
 FILES="usr/share/man/man1/byobu-status.1 usr/share/byobu/tests/byobu-time-notifications usr/lib/byobu/updates_available"
@@ -75,7 +73,7 @@ desktop-file-install usr/share/applications/%{name}.desktop --dir %{buildroot}%{
 %find_lang %{name}
 
 %clean
-rm -rf %{buildroot}
+#rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -93,10 +91,14 @@ rm -rf %{buildroot}
 %{_mandir}/man1/shell*
 %{_mandir}/man1/%{name}*.1.gz
 %{_libexecdir}/%{name}/*
+%{_libexecdir}/%{name}/.notify_osd
 
 %changelog
-* Sun Sep 5 2010 Jan Klepek <jan.klepek at, gmail.com> - 3.4-2
-- fixed path to DOC directory
+* Sat Jan 8 2011 Jan Klepek <jan.klepek at, gmail.com> - 3.21-1
+- new release
+
+* Sat Dec 18 2010 Jan Klepek <jan.klepek at, gmail.com> - 3.20-2
+- upgrade to 3.20 + some patches
 
 * Fri Sep 3 2010 Jan Klepek <jan.klepek at, gmail.com> - 3.4-1
 - upgraded to 3.4
diff --git a/sources b/sources
index 00d2f88..41b543c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-694c1663f178517b995ec9ca574fc463  byobu_3.4.orig.tar.gz
+44f34ee5f1c11559213756f359ca585c  byobu_3.21.orig.tar.gz