Sophie

Sophie

distrib > Fedora > 16 > x86_64 > media > updates-src > by-pkgid > f952a1f367c917800e43a4ea0d863495 > files > 1

tomboy-1.8.3-2.fc16.src.rpm

diff -up tomboy-1.8.3/configure.in.orig tomboy-1.8.3/configure.in
--- tomboy-1.8.3/configure.in.orig	2011-11-14 18:32:07.000000000 +0100
+++ tomboy-1.8.3/configure.in	2011-12-10 16:31:48.705042246 +0100
@@ -170,9 +170,9 @@ fi
 AC_SUBST(DBUS_SERVICE_DIR)
 
 #
-# Check for dbus-sharp
+# Check for NDesk DBus
 #
-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
+PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3)
 AC_SUBST(DBUS_LIBS)
 
 #
diff -up tomboy-1.8.3/configure.orig tomboy-1.8.3/configure
--- tomboy-1.8.3/configure.orig	2011-11-14 18:34:03.000000000 +0100
+++ tomboy-1.8.3/configure	2011-12-10 16:31:48.764044089 +0100
@@ -14433,7 +14433,7 @@ fi
 
 
 #
-# Check for dbus-sharp
+# Check for ndesk-dbus
 #
 
 pkg_failed=no
@@ -14444,12 +14444,12 @@ if test -n "$DBUS_CFLAGS"; then
     pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>/dev/null`
+  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14461,12 +14461,12 @@ if test -n "$DBUS_LIBS"; then
     pkg_cv_DBUS_LIBS="$DBUS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>/dev/null`
+  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -14487,14 +14487,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>&1`
         fi
 	# 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:
 
 $DBUS_PKG_ERRORS
 
diff -up tomboy-1.8.3/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.8.3/Tomboy/Addins/Tasque/RemoteControl.cs
--- tomboy-1.8.3/Tomboy/Addins/Tasque/RemoteControl.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/Addins/Tasque/RemoteControl.cs	2011-12-10 16:31:48.703042184 +0100
@@ -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.8.3/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.8.3/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
--- tomboy-1.8.3/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/Addins/Tasque/TasqueNoteAddin.cs	2011-12-10 16:31:48.704042215 +0100
@@ -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.8.3/Tomboy/GnomeApplication.cs.orig tomboy-1.8.3/Tomboy/GnomeApplication.cs
--- tomboy-1.8.3/Tomboy/GnomeApplication.cs.orig	2011-07-11 21:14:40.000000000 +0200
+++ tomboy-1.8.3/Tomboy/GnomeApplication.cs	2011-12-10 16:31:48.704042215 +0100
@@ -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.8.3/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.8.3/Tomboy/Gnome.Keyring/Ring.cs
--- tomboy-1.8.3/Tomboy/Gnome.Keyring/Ring.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/Gnome.Keyring/Ring.cs	2011-12-10 16:31:48.704042215 +0100
@@ -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.8.3/Tomboy/GnomeSession.cs.orig tomboy-1.8.3/Tomboy/GnomeSession.cs
--- tomboy-1.8.3/Tomboy/GnomeSession.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/GnomeSession.cs	2011-12-10 16:31:48.704042215 +0100
@@ -21,7 +21,7 @@
 //
 
 using System;
-using DBus;
+using NDesk.DBus;
 using org.freedesktop.DBus;
 
 // Gnome Session DBus API
diff -up tomboy-1.8.3/Tomboy/RemoteControl.cs.orig tomboy-1.8.3/Tomboy/RemoteControl.cs
--- tomboy-1.8.3/Tomboy/RemoteControl.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/RemoteControl.cs	2011-12-10 16:31:48.704042215 +0100
@@ -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.8.3/Tomboy/RemoteControlProxy.cs.orig tomboy-1.8.3/Tomboy/RemoteControlProxy.cs
--- tomboy-1.8.3/Tomboy/RemoteControlProxy.cs.orig	2011-06-21 02:55:49.000000000 +0200
+++ tomboy-1.8.3/Tomboy/RemoteControlProxy.cs	2011-12-10 16:31:48.704042215 +0100
@@ -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;

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional