From 8961a7bbd15ee250930da5c0625c0cbe6e862d4b Mon Sep 17 00:00:00 2001 From: Jan Klepek Date: Sep 04 2010 08:40:12 +0000 Subject: updated to 3.4 version --- diff --git a/.gitignore b/.gitignore index 7acb998..55af8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ byobu_2.80.orig.tar.gz +/byobu_3.4.orig.tar.gz diff --git a/byobu-status.patch b/byobu-status.patch new file mode 100644 index 0000000..9a425a8 --- /dev/null +++ b/byobu-status.patch @@ -0,0 +1,11 @@ +--- /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 ce52644..1fa649d 100644 --- a/byobu.spec +++ b/byobu.spec @@ -1,5 +1,5 @@ Name: byobu -Version: 2.80 +Version: 3.4 Release: 1%{?dist} Summary: Light-weight, configurable window manager built upon GNU screen @@ -9,6 +9,7 @@ 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 @@ -25,9 +26,10 @@ 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/bin/byobu-status usr/bin/byobu-export usr/lib/byobu/updates_available" +FILES="usr/share/man/man1/byobu-status.1 usr/share/byobu/tests/byobu-time-notifications usr/lib/byobu/updates_available" for i in $FILES; do sed -i "s#usr/lib#%{_libexecdir}#g" $i; done @@ -88,6 +90,9 @@ rm -rf %{buildroot} %{_libexecdir}/%{name}/* %changelog +* Fri Sep 3 2010 Jan Klepek - 3.4-1 +- upgraded to 3.4 + * Thu Jun 17 2010 Jan Klepek - 2.80-1 - bugfix for BZ#595087, changed default windows selection, removed apport from toggle status notification - upgraded to 2.80 version diff --git a/sources b/sources index f817bfb..00d2f88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b3d9320c3f09a20e2282b6e495dbbc2f byobu_2.80.orig.tar.gz +694c1663f178517b995ec9ca574fc463 byobu_3.4.orig.tar.gz