[tomboy/f15] Move back to stable branch (no update had been submitted).

[Thomas Moschny]

commit ffe497159f8de01e40edf09f04d3561cc492c741
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 9 13:38:27 2011 +0200

    Move back to stable branch (no update had been submitted).

 .gitignore                    |    1 +
 sources                       |    2 +-
 tomboy-1.7.0-ndesk-dbus.patch |  152 -----------------------------------------
 tomboy.spec                   |   12 ++--
 4 files changed, 8 insertions(+), 159 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ead47b2..27ed301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tomboy-1.3.1.tar.bz2
 /tomboy-1.5.2.tar.bz2
 /tomboy-1.6.0.tar.bz2
 /tomboy-1.7.0.tar.bz2
+/tomboy-1.6.1.tar.bz2
diff --git a/sources b/sources
index 399d4f3..2271f48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e652e26f3457249914743b800d071a3f  tomboy-1.7.0.tar.bz2
+98226580855afe18e1947ace8065cc0f  tomboy-1.6.1.tar.bz2
diff --git a/tomboy.spec b/tomboy.spec
index 7ecd1e0..79f7277 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        1.7.0
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Note-taking application
 Group:          User Interface/Desktops
 License:        LGPLv2+ and GPLv2+ and MIT
@@ -9,9 +9,7 @@ License:        LGPLv2+ and GPLv2+ and MIT
 # Mono.Addins is MIT
 URL:            http://projects.gnome.org/tomboy/
 #VCS: git:git://git.gnome.org/tomboy
-Source0:        http://download.gnome.org/sources/%{name}/1.7/%{name}-%{version}.tar.bz2
-# Revert commit 25090928, until we have new dbus-sharp{,-glib} packages
-Patch0:         tomboy-1.7.0-ndesk-dbus.patch
+Source0:        http://download.gnome.org/sources/%{name}/1.6/%{name}-%{version}.tar.bz2
 %if 0%{?fedora} < 15
 %global with_panel_applet 1
 %endif
@@ -71,7 +69,6 @@ to develop addins that add new functionality to tomboy.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Convert to utf-8
 for file in ChangeLog ; do
@@ -160,6 +157,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Sat Jul  9 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.1-1
+- Move back to stable branch (no update had been submitted).
+
 * Thu Jun 16 2011 Dan Horák <dan[at]danny.cz> - 1.7.0-2
 - updated the supported arch list