[bisho] - New upstream 0.26.0 release

[Peter Robinson]

commit 85dc9db16297c1a2a1997bcb9ee7f4951a926840
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Aug 7 20:00:39 2010 +0100

    - New upstream 0.26.0 release

 .gitignore                 |    1 +
 bisho-disablecapplet.patch |   65 --------------------------------------------
 bisho.spec                 |   16 +++++-----
 sources                    |    2 +-
 4 files changed, 10 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8c1adf..85d182a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bisho-0.25.1.tar.gz
+bisho-0.26.0.tar.bz2
diff --git a/bisho.spec b/bisho.spec
index c27daff..60d5422 100644
--- a/bisho.spec
+++ b/bisho.spec
@@ -1,11 +1,10 @@
 # Tarfile created using git
 # git clone git://gitorious.org/meego-netbook-ux/bisho.git
-# git archive --format=tar --prefix=bisho-%{version}/ %{git_version} | bzip2 > %{name}-%{version}.tar.bz2
-%define git_version 211f893
-%define tarfile %{name}-%{version}.tar.gz
+# git archive --format=tar --prefix=bisho-%{version}/ %{version} | bzip2 > %{name}-%{version}.tar.bz2
+%define tarfile %{name}-%{version}.tar.bz2
 
 Name:          bisho
-Version:       0.25.1
+Version:       0.26.0
 Release:       1%{?dist}
 Summary:       MeeGo configuration tool for libsocialweb social network aggregator
 
@@ -13,8 +12,6 @@ Group:         System Environment/Libraries
 License:       GPLv2+
 URL:           http://www.meego.com
 Source0:       %{tarfile}
-Patch0:        bisho-disablecapplet.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
@@ -52,9 +49,9 @@ Files for development with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .disablecapplet
 
-autoreconf
+# Don't run configure from autogen.sh
+NOCONFIGURE=yes ./autogen.sh --disable-capplet
 
 %build
 %configure --disable-static --disable-schemas --disable-capplet
@@ -129,6 +126,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/bisho.pc
 
 %changelog
+* Sat Aug  7 2010 Peter Robinson <pbrobinson at gmail.com> 0.26.0-1
+- New upstream 0.26.0 release
+
 * Sun Jul 11 2010 Peter Robinson <pbrobinson at gmail.com> 0.25.1-1
 - New upstream 0.25.1 release
 
diff --git a/sources b/sources
index ef3e1db..e1b57d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9127b551bc2459fde20d71b2d551d124  bisho-0.25.1.tar.gz
+80d7d2909cc1ec5c6fe64fa8773bebc9  bisho-0.26.0.tar.bz2