[tomboy] Update to 1.7.6. Use xz-compressed source.
Thomas Moschny
thm at fedoraproject.org
Tue Sep 13 22:37:53 UTC 2011
commit 5dd48ac5ea6333de288f677d5254d75ddf67a88d
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Wed Sep 14 00:37:10 2011 +0200
Update to 1.7.6.
Use xz-compressed source.
.gitignore | 1 +
sources | 2 +-
...esk-dbus.patch => tomboy-1.7.6-ndesk-dbus.patch | 68 ++++++++++----------
tomboy.spec | 10 ++-
4 files changed, 43 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be55664..954d568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tomboy-1.3.1.tar.bz2
/tomboy-1.6.0.tar.bz2
/tomboy-1.7.0.tar.bz2
/tomboy-1.7.1.tar.bz2
+/tomboy-1.7.6.tar.xz
diff --git a/sources b/sources
index 327aa61..89b71d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83ecd0ddf7c9f864114d4c9c38377bb0 tomboy-1.7.1.tar.bz2
+9c6ec0520a4c987f4962d2166dda1a2c tomboy-1.7.6.tar.xz
diff --git a/tomboy-1.7.1-ndesk-dbus.patch b/tomboy-1.7.6-ndesk-dbus.patch
similarity index 60%
rename from tomboy-1.7.1-ndesk-dbus.patch
rename to tomboy-1.7.6-ndesk-dbus.patch
index cd2afa8..f74a7f3 100644
--- a/tomboy-1.7.1-ndesk-dbus.patch
+++ b/tomboy-1.7.6-ndesk-dbus.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -170,9 +170,9 @@ fi
AC_SUBST(DBUS_SERVICE_DIR)
@@ -13,19 +13,19 @@ diff -up tomboy-1.7.1/configure.in.orig tomboy-1.7.1/configure.in
AC_SUBST(DBUS_LIBS)
#
-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
+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
#
-# Check for dbus-sharp
-+# Check for NDesk DBus
++# Check for ndesk-dbus
#
pkg_failed=no
-@@ -13766,12 +13766,12 @@ if test -n "$DBUS_CFLAGS"; then
+@@ -13637,12 +13637,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.1/configure.orig tomboy-1.7.1/configure
else
pkg_failed=yes
fi
-@@ -13782,12 +13782,12 @@ if test -n "$DBUS_LIBS"; then
+@@ -13653,12 +13653,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.1/configure.orig tomboy-1.7.1/configure
else
pkg_failed=yes
fi
-@@ -13807,14 +13807,14 @@ else
+@@ -13678,14 +13678,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -70,14 +70,14 @@ diff -up tomboy-1.7.1/configure.orig tomboy-1.7.1/configure
# 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
+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
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
@@ -87,9 +87,9 @@ diff -up tomboy-1.7.1/Tomboy/Addins/Tasque/RemoteControl.cs.orig tomboy-1.7.1/To
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
+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
@@ -5,7 +5,7 @@ using Mono.Unix;
using Tomboy;
@@ -99,9 +99,9 @@ diff -up tomboy-1.7.1/Tomboy/Addins/Tasque/TasqueNoteAddin.cs.orig tomboy-1.7.1/
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
+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
@@ -9,7 +9,7 @@ using Mono.Unix.Native;
using Hyena;
@@ -111,9 +111,9 @@ diff -up tomboy-1.7.1/Tomboy/GnomeApplication.cs.orig tomboy-1.7.1/Tomboy/GnomeA
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
+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
@@ -39,7 +39,7 @@ using System.Reflection;
using Mono.Unix;
@@ -123,9 +123,9 @@ diff -up tomboy-1.7.1/Tomboy/Gnome.Keyring/Ring.cs.orig tomboy-1.7.1/Tomboy/Gnom
#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
+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
@@ -21,7 +21,7 @@
//
@@ -135,9 +135,9 @@ diff -up tomboy-1.7.1/Tomboy/GnomeSession.cs.orig tomboy-1.7.1/Tomboy/GnomeSessi
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
+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
@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
@@ -147,9 +147,9 @@ diff -up tomboy-1.7.1/Tomboy/RemoteControl.cs.orig tomboy-1.7.1/Tomboy/RemoteCon
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
+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
@@ -1,7 +1,7 @@
using System;
using System.Threading;
diff --git a/tomboy.spec b/tomboy.spec
index 3fc5bc6..ea1ce69 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.7.1
+Version: 1.7.6
Release: 1%{?dist}
Summary: Note-taking application
Group: User Interface/Desktops
@@ -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.bz2
+Source0: http://download.gnome.org/sources/%{name}/1.7/%{name}-%{version}.tar.xz
# Revert commit 25090928, until we have new dbus-sharp{,-glib} packages
-Patch0: tomboy-1.7.1-ndesk-dbus.patch
+Patch0: tomboy-1.7.6-ndesk-dbus.patch
%if 0%{?fedora} < 15
%global with_panel_applet 1
%endif
@@ -159,6 +159,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
+* Tue Sep 13 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.6-1
+- Update to 1.7.6.
+- Use xz-compressed source.
+
* 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.
More information about the scm-commits
mailing list