[tomboy] Update Source tag; minor fixes.

Thomas Moschny thm at fedoraproject.org
Thu Sep 29 07:47:40 UTC 2011 

commit 5097365e1596662fc965721a7940dab2016bcdfd
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Sep 29 09:45:03 2011 +0200

    Update Source tag; minor fixes.

 ...esk-dbus.patch => tomboy-1.8.0-ndesk-dbus.patch |   62 ++++++++++----------
 tomboy.spec                                        |    6 +-
 2 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/tomboy-1.7.6-ndesk-dbus.patch b/tomboy-1.8.0-ndesk-dbus.patch
similarity index 64%
rename from tomboy-1.7.6-ndesk-dbus.patch
rename to tomboy-1.8.0-ndesk-dbus.patch
index f74a7f3..5e25762 100644
--- a/tomboy-1.7.6-ndesk-dbus.patch
+++ b/tomboy-1.8.0-ndesk-dbus.patch
@@ -1,6 +1,6 @@
-diff -up tomboy-1.7.6/configure.in.orig tomboy-1.7.6/configure.in
---- tomboy-1.7.6/configure.in.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/configure.in	2011-09-13 23:35:36.108637768 +0200
+diff -up tomboy-1.8.0/configure.in.orig tomboy-1.8.0/configure.in
+--- tomboy-1.8.0/configure.in.orig	2011-09-26 17:21:59.000000000 +0200
++++ tomboy-1.8.0/configure.in	2011-09-28 22:50:02.494856548 +0200
 @@ -170,9 +170,9 @@ fi
  AC_SUBST(DBUS_SERVICE_DIR)
  
@@ -13,10 +13,10 @@ diff -up tomboy-1.7.6/configure.in.orig tomboy-1.7.6/configure.in
  AC_SUBST(DBUS_LIBS)
  
  #
-diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
---- tomboy-1.7.6/configure.orig	2011-09-05 19:46:41.000000000 +0200
-+++ tomboy-1.7.6/configure	2011-09-13 23:36:18.206727179 +0200
-@@ -13626,7 +13626,7 @@ fi
+diff -up tomboy-1.8.0/configure.orig tomboy-1.8.0/configure
+--- tomboy-1.8.0/configure.orig	2011-09-26 17:23:27.000000000 +0200
++++ tomboy-1.8.0/configure	2011-09-28 22:50:12.886134723 +0200
+@@ -13634,7 +13634,7 @@ fi
  
  
  #
@@ -25,7 +25,7 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
  #
  
  pkg_failed=no
-@@ -13637,12 +13637,12 @@ if test -n "$DBUS_CFLAGS"; then
+@@ -13645,12 +13645,12 @@ if test -n "$DBUS_CFLAGS"; then
      pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -41,7 +41,7 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
  else
    pkg_failed=yes
  fi
-@@ -13653,12 +13653,12 @@ if test -n "$DBUS_LIBS"; then
+@@ -13661,12 +13661,12 @@ if test -n "$DBUS_LIBS"; then
      pkg_cv_DBUS_LIBS="$DBUS_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
@@ -57,7 +57,7 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
  else
    pkg_failed=yes
  fi
-@@ -13678,14 +13678,14 @@ else
+@@ -13686,14 +13686,14 @@ else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -75,9 +75,9 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
  
  $DBUS_PKG_ERRORS
  
-diff -up tomboy-1.7.6/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.7.6/Tomboy/Addins/Tasque/RemoteControl.cs
---- tomboy-1.7.6/Tomboy/Addins/Tasque/RemoteControl.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/Addins/Tasque/RemoteControl.cs	2011-09-13 23:35:36.106637717 +0200
+diff -up tomboy-1.8.0/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.8.0/Tomboy/Addins/Tasque/RemoteControl.cs
+--- tomboy-1.8.0/Tomboy/Addins/Tasque/RemoteControl.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/Addins/Tasque/RemoteControl.cs	2011-09-28 22:50:02.493856534 +0200
 @@ -4,7 +4,7 @@
  using System;
  using System.Collections.Generic;
@@ -87,9 +87,9 @@ diff -up tomboy-1.7.6/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.7.6/To
  using org.freedesktop.DBus;
  
  namespace Tasque
-diff -up tomboy-1.7.6/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.7.6/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
---- tomboy-1.7.6/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/Addins/Tasque/TasqueNoteAddin.cs	2011-09-13 23:35:36.107637742 +0200
+diff -up tomboy-1.8.0/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.8.0/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
+--- tomboy-1.8.0/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/Addins/Tasque/TasqueNoteAddin.cs	2011-09-28 22:50:02.493856534 +0200
 @@ -5,7 +5,7 @@ using Mono.Unix;
  
  using Tomboy;
@@ -99,9 +99,9 @@ diff -up tomboy-1.7.6/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.7.6/
  using org.freedesktop.DBus;
  
  namespace Tomboy.TasqueAddin
-diff -up tomboy-1.7.6/Tomboy/GnomeApplication.cs.orig tomboy-1.7.6/Tomboy/GnomeApplication.cs
---- tomboy-1.7.6/Tomboy/GnomeApplication.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/GnomeApplication.cs	2011-09-13 23:35:36.107637742 +0200
+diff -up tomboy-1.8.0/Tomboy/GnomeApplication.cs.orig tomboy-1.8.0/Tomboy/GnomeApplication.cs
+--- tomboy-1.8.0/Tomboy/GnomeApplication.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/GnomeApplication.cs	2011-09-28 22:50:02.494856548 +0200
 @@ -9,7 +9,7 @@ using Mono.Unix.Native;
  
  using Hyena;
@@ -111,9 +111,9 @@ diff -up tomboy-1.7.6/Tomboy/GnomeApplication.cs.orig tomboy-1.7.6/Tomboy/GnomeA
  using org.gnome.SessionManager;
  
  namespace Tomboy
-diff -up tomboy-1.7.6/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.7.6/Tomboy/Gnome.Keyring/Ring.cs
---- tomboy-1.7.6/Tomboy/Gnome.Keyring/Ring.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/Gnome.Keyring/Ring.cs	2011-09-13 23:35:36.107637742 +0200
+diff -up tomboy-1.8.0/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.8.0/Tomboy/Gnome.Keyring/Ring.cs
+--- tomboy-1.8.0/Tomboy/Gnome.Keyring/Ring.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/Gnome.Keyring/Ring.cs	2011-09-28 22:50:02.493856534 +0200
 @@ -39,7 +39,7 @@ using System.Reflection;
  using Mono.Unix;
  
@@ -123,9 +123,9 @@ diff -up tomboy-1.7.6/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.7.6/Tomboy/Gnom
  #endif
  
  namespace Gnome.Keyring {
-diff -up tomboy-1.7.6/Tomboy/GnomeSession.cs.orig tomboy-1.7.6/Tomboy/GnomeSession.cs
---- tomboy-1.7.6/Tomboy/GnomeSession.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/GnomeSession.cs	2011-09-13 23:35:36.107637742 +0200
+diff -up tomboy-1.8.0/Tomboy/GnomeSession.cs.orig tomboy-1.8.0/Tomboy/GnomeSession.cs
+--- tomboy-1.8.0/Tomboy/GnomeSession.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/GnomeSession.cs	2011-09-28 22:50:02.494856548 +0200
 @@ -21,7 +21,7 @@
  //
  
@@ -135,9 +135,9 @@ diff -up tomboy-1.7.6/Tomboy/GnomeSession.cs.orig tomboy-1.7.6/Tomboy/GnomeSessi
  using org.freedesktop.DBus;
  
  // Gnome Session DBus API
-diff -up tomboy-1.7.6/Tomboy/RemoteControl.cs.orig tomboy-1.7.6/Tomboy/RemoteControl.cs
---- tomboy-1.7.6/Tomboy/RemoteControl.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/RemoteControl.cs	2011-09-13 23:35:36.107637742 +0200
+diff -up tomboy-1.8.0/Tomboy/RemoteControl.cs.orig tomboy-1.8.0/Tomboy/RemoteControl.cs
+--- tomboy-1.8.0/Tomboy/RemoteControl.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/RemoteControl.cs	2011-09-28 22:50:02.494856548 +0200
 @@ -2,7 +2,7 @@
  using System;
  using System.Collections.Generic;
@@ -147,9 +147,9 @@ diff -up tomboy-1.7.6/Tomboy/RemoteControl.cs.orig tomboy-1.7.6/Tomboy/RemoteCon
  using org.freedesktop.DBus;
  #endif
  
-diff -up tomboy-1.7.6/Tomboy/RemoteControlProxy.cs.orig tomboy-1.7.6/Tomboy/RemoteControlProxy.cs
---- tomboy-1.7.6/Tomboy/RemoteControlProxy.cs.orig	2011-09-05 19:46:31.000000000 +0200
-+++ tomboy-1.7.6/Tomboy/RemoteControlProxy.cs	2011-09-13 23:35:36.108637768 +0200
+diff -up tomboy-1.8.0/Tomboy/RemoteControlProxy.cs.orig tomboy-1.8.0/Tomboy/RemoteControlProxy.cs
+--- tomboy-1.8.0/Tomboy/RemoteControlProxy.cs.orig	2011-07-05 03:10:30.000000000 +0200
++++ tomboy-1.8.0/Tomboy/RemoteControlProxy.cs	2011-09-28 22:50:02.494856548 +0200
 @@ -1,7 +1,7 @@
  using System;
  using System.Threading;
diff --git a/tomboy.spec b/tomboy.spec
index 9bcab45..d597d20 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -9,9 +9,9 @@ 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.xz
+Source0:        http://download.gnome.org/sources/%{name}/1.8/%{name}-%{version}.tar.xz
 # Revert commit 25090928, until we have new dbus-sharp{,-glib} packages
-Patch0:         tomboy-1.7.6-ndesk-dbus.patch
+Patch0:         tomboy-1.8.0-ndesk-dbus.patch
 %if 0%{?fedora} < 15
 %global with_panel_applet 1
 %endif
@@ -159,7 +159,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
-* Wed Sep 28 2011 Ray <rstrode at redhat.com> - 1.8.0-1
+* Wed Sep 28 2011 Ray Strode <rstrode at redhat.com> - 1.8.0-1
 - Update to 1.8.0
 
 * Tue Sep 13 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.6-1

More information about the scm-commits mailing list