[tomboy] Update to 1.7.1. Drop dependency on gconf-sharp-peditors.
Thomas Moschny
thm at fedoraproject.org
Sat Jul 9 11:10:41 UTC 2011
commit d537a44394b3712aee8496e1cf25cd37290ed410
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sat Jul 9 12:53:18 2011 +0200
Update to 1.7.1.
Drop dependency on gconf-sharp-peditors.
.gitignore | 1 +
sources | 2 +-
...esk-dbus.patch => tomboy-1.7.1-ndesk-dbus.patch | 183 ++++++++++---------
tomboy.spec | 11 +-
4 files changed, 105 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ead47b2..be55664 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.7.1.tar.bz2
diff --git a/sources b/sources
index 399d4f3..327aa61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e652e26f3457249914743b800d071a3f tomboy-1.7.0.tar.bz2
+83ecd0ddf7c9f864114d4c9c38377bb0 tomboy-1.7.1.tar.bz2
diff --git a/tomboy-1.7.0-ndesk-dbus.patch b/tomboy-1.7.1-ndesk-dbus.patch
similarity index 60%
rename from tomboy-1.7.0-ndesk-dbus.patch
rename to tomboy-1.7.1-ndesk-dbus.patch
index b72d89f..cd2afa8 100644
--- a/tomboy-1.7.0-ndesk-dbus.patch
+++ b/tomboy-1.7.1-ndesk-dbus.patch
@@ -1,82 +1,6 @@
---- a/Tomboy/Addins/Tasque/RemoteControl.cs
-+++ b/Tomboy/Addins/Tasque/RemoteControl.cs
-@@ -4,7 +4,7 @@
- using System;
- using System.Collections.Generic;
-
--using DBus;
-+using NDesk.DBus;
- using org.freedesktop.DBus;
-
- namespace Tasque
---- a/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
-+++ b/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
-@@ -5,7 +5,7 @@ using Mono.Unix;
-
- using Tomboy;
-
--using DBus;
-+using NDesk.DBus;
- using org.freedesktop.DBus;
-
- namespace Tomboy.TasqueAddin
---- a/Tomboy/Gnome.Keyring/Ring.cs
-+++ b/Tomboy/Gnome.Keyring/Ring.cs
-@@ -39,7 +39,7 @@ using System.Reflection;
- using Mono.Unix;
-
- #if ENABLE_DBUS
--using DBus;
-+using NDesk.DBus;
- #endif
-
- namespace Gnome.Keyring {
---- a/Tomboy/GnomeApplication.cs
-+++ b/Tomboy/GnomeApplication.cs
-@@ -9,7 +9,7 @@ using Mono.Unix.Native;
-
- using Hyena;
-
--using DBus;
-+using NDesk.DBus;
- using org.gnome.SessionManager;
-
- namespace Tomboy
---- a/Tomboy/GnomeSession.cs
-+++ b/Tomboy/GnomeSession.cs
-@@ -21,7 +21,7 @@
- //
-
- using System;
--using DBus;
-+using NDesk.DBus;
- using org.freedesktop.DBus;
-
- // Gnome Session DBus API
---- a/Tomboy/RemoteControl.cs
-+++ b/Tomboy/RemoteControl.cs
-@@ -2,7 +2,7 @@
- using System;
- using System.Collections.Generic;
- #if ENABLE_DBUS
--using DBus;
-+using NDesk.DBus;
- using org.freedesktop.DBus;
- #endif
-
---- a/Tomboy/RemoteControlProxy.cs
-+++ b/Tomboy/RemoteControlProxy.cs
-@@ -1,7 +1,7 @@
- using System;
- using System.Threading;
- #if ENABLE_DBUS
--using DBus;
-+using NDesk.DBus;
- using org.freedesktop.DBus;
- #else
- using System.Runtime.Remoting;
---- a/configure.in
-+++ b/configure.in
+diff -up tomboy-1.7.1/configure.in.orig tomboy-1.7.1/configure.in
+--- tomboy-1.7.1/configure.in.orig 2011-06-26 07:31:25.000000000 +0200
++++ tomboy-1.7.1/configure.in 2011-07-09 12:34:53.585394763 +0200
@@ -170,9 +170,9 @@ fi
AC_SUBST(DBUS_SERVICE_DIR)
@@ -89,9 +13,10 @@
AC_SUBST(DBUS_LIBS)
#
---- a/configure
-+++ b/configure
-@@ -13632,7 +13632,7 @@
+diff -up tomboy-1.7.1/configure.orig tomboy-1.7.1/configure
+--- tomboy-1.7.1/configure.orig 2011-06-26 09:26:10.000000000 +0200
++++ tomboy-1.7.1/configure 2011-07-09 12:24:11.076668651 +0200
+@@ -13755,7 +13755,7 @@ fi
#
@@ -100,7 +25,7 @@
#
pkg_failed=no
-@@ -13643,12 +13643,12 @@
+@@ -13766,12 +13766,12 @@ if test -n "$DBUS_CFLAGS"; then
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -116,7 +41,7 @@
else
pkg_failed=yes
fi
-@@ -13659,12 +13659,12 @@
+@@ -13782,12 +13782,12 @@ if test -n "$DBUS_LIBS"; then
pkg_cv_DBUS_LIBS="$DBUS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -132,7 +57,7 @@
else
pkg_failed=yes
fi
-@@ -13684,14 +13684,14 @@
+@@ -13807,14 +13807,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -145,8 +70,92 @@
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
-- as_fn_error $? "Package requirements (dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3) were not met:
-+ as_fn_error $? "Package requirements (ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3) were not met:
+- as_fn_error "Package requirements (dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3) were not met:
++ as_fn_error "Package requirements (ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3) were not met:
$DBUS_PKG_ERRORS
+diff -up tomboy-1.7.1/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.7.1/Tomboy/Addins/Tasque/RemoteControl.cs
+--- tomboy-1.7.1/Tomboy/Addins/Tasque/RemoteControl.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/Addins/Tasque/RemoteControl.cs 2011-07-09 12:30:43.088982554 +0200
+@@ -4,7 +4,7 @@
+ using System;
+ using System.Collections.Generic;
+
+-using DBus;
++using NDesk.DBus;
+ using org.freedesktop.DBus;
+
+ namespace Tasque
+diff -up tomboy-1.7.1/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.7.1/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
+--- tomboy-1.7.1/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/Addins/Tasque/TasqueNoteAddin.cs 2011-07-09 12:30:43.088982554 +0200
+@@ -5,7 +5,7 @@ using Mono.Unix;
+
+ using Tomboy;
+
+-using DBus;
++using NDesk.DBus;
+ using org.freedesktop.DBus;
+
+ namespace Tomboy.TasqueAddin
+diff -up tomboy-1.7.1/Tomboy/GnomeApplication.cs.orig tomboy-1.7.1/Tomboy/GnomeApplication.cs
+--- tomboy-1.7.1/Tomboy/GnomeApplication.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/GnomeApplication.cs 2011-07-09 12:30:43.089982579 +0200
+@@ -9,7 +9,7 @@ using Mono.Unix.Native;
+
+ using Hyena;
+
+-using DBus;
++using NDesk.DBus;
+ using org.gnome.SessionManager;
+
+ namespace Tomboy
+diff -up tomboy-1.7.1/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.7.1/Tomboy/Gnome.Keyring/Ring.cs
+--- tomboy-1.7.1/Tomboy/Gnome.Keyring/Ring.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/Gnome.Keyring/Ring.cs 2011-07-09 12:30:43.088982554 +0200
+@@ -39,7 +39,7 @@ using System.Reflection;
+ using Mono.Unix;
+
+ #if ENABLE_DBUS
+-using DBus;
++using NDesk.DBus;
+ #endif
+
+ namespace Gnome.Keyring {
+diff -up tomboy-1.7.1/Tomboy/GnomeSession.cs.orig tomboy-1.7.1/Tomboy/GnomeSession.cs
+--- tomboy-1.7.1/Tomboy/GnomeSession.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/GnomeSession.cs 2011-07-09 12:30:43.089982579 +0200
+@@ -21,7 +21,7 @@
+ //
+
+ using System;
+-using DBus;
++using NDesk.DBus;
+ using org.freedesktop.DBus;
+
+ // Gnome Session DBus API
+diff -up tomboy-1.7.1/Tomboy/RemoteControl.cs.orig tomboy-1.7.1/Tomboy/RemoteControl.cs
+--- tomboy-1.7.1/Tomboy/RemoteControl.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/RemoteControl.cs 2011-07-09 12:30:43.089982579 +0200
+@@ -2,7 +2,7 @@
+ using System;
+ using System.Collections.Generic;
+ #if ENABLE_DBUS
+-using DBus;
++using NDesk.DBus;
+ using org.freedesktop.DBus;
+ #endif
+
+diff -up tomboy-1.7.1/Tomboy/RemoteControlProxy.cs.orig tomboy-1.7.1/Tomboy/RemoteControlProxy.cs
+--- tomboy-1.7.1/Tomboy/RemoteControlProxy.cs.orig 2011-06-21 02:55:49.000000000 +0200
++++ tomboy-1.7.1/Tomboy/RemoteControlProxy.cs 2011-07-09 12:30:43.089982579 +0200
+@@ -1,7 +1,7 @@
+ using System;
+ using System.Threading;
+ #if ENABLE_DBUS
+-using DBus;
++using NDesk.DBus;
+ using org.freedesktop.DBus;
+ #else
+ using System.Runtime.Remoting;
diff --git a/tomboy.spec b/tomboy.spec
index 7ecd1e0..3fc5bc6 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,6 +1,6 @@
Name: tomboy
-Version: 1.7.0
-Release: 2%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
Summary: Note-taking application
Group: User Interface/Desktops
License: LGPLv2+ and GPLv2+ and MIT
@@ -11,14 +11,13 @@ 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
+Patch0: tomboy-1.7.1-ndesk-dbus.patch
%if 0%{?fedora} < 15
%global with_panel_applet 1
%endif
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(gconf-sharp-2.0)
-BuildRequires: pkgconfig(gconf-sharp-peditors-2.0)
BuildRequires: pkgconfig(gdk-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk-sharp-2.0)
@@ -160,6 +159,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
+* Sat Jul 9 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.1-1
+- Update to 1.7.1.
+- Drop dependency on gconf-sharp-peditors.
+
* Thu Jun 16 2011 Dan Horák <dan[at]danny.cz> - 1.7.0-2
- updated the supported arch list
More information about the scm-commits
mailing list