[tomboy/f16] Update to 1.8.3. Remove conditionals not needed anymore. Minor spec file fixes.
Thomas Moschny
thm at fedoraproject.org
Sat Dec 10 15:41:08 UTC 2011
commit c165fdebfc0841fd866e7bdc58b71bba328597c3
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Sat Dec 10 16:33:45 2011 +0100
Update to 1.8.3.
Remove conditionals not needed anymore.
Minor spec file fixes.
.gitignore | 1 +
sources | 2 +-
...esk-dbus.patch => tomboy-1.8.3-ndesk-dbus.patch | 74 ++++++++++----------
tomboy.spec | 26 ++-----
4 files changed, 47 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9c5f392..26b4a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tomboy-1.3.1.tar.bz2
/tomboy-1.7.1.tar.bz2
/tomboy-1.7.6.tar.xz
/tomboy-1.8.0.tar.xz
+/tomboy-1.8.3.tar.xz
diff --git a/sources b/sources
index 00e7685..3f9b6f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d870b85fb546fd2de468fd876ce1bf73 tomboy-1.8.0.tar.xz
+1246c3fa937505092d97451a5a7af5b3 tomboy-1.8.3.tar.xz
diff --git a/tomboy-1.7.6-ndesk-dbus.patch b/tomboy-1.8.3-ndesk-dbus.patch
similarity index 57%
rename from tomboy-1.7.6-ndesk-dbus.patch
rename to tomboy-1.8.3-ndesk-dbus.patch
index f74a7f3..68f3f27 100644
--- a/tomboy-1.7.6-ndesk-dbus.patch
+++ b/tomboy-1.8.3-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.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)
@@ -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.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
#
@@ -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
+@@ -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" && \
@@ -38,10 +38,10 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
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
- fi
-@@ -13653,12 +13653,12 @@ if test -n "$DBUS_LIBS"; then
+@@ -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" && \
@@ -54,18 +54,18 @@ diff -up tomboy-1.7.6/configure.orig tomboy-1.7.6/configure
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
- fi
-@@ -13678,14 +13678,14 @@ else
+@@ -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 "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>&1`
+- 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 "dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3" 2>&1`
-+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3" 2>&1`
+- 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
@@ -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.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;
@@ -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.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;
@@ -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.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;
@@ -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.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;
@@ -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.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 @@
//
@@ -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.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;
@@ -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.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;
diff --git a/tomboy.spec b/tomboy.spec
index 261e894..968abc8 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.8.0
+Version: 1.8.3
Release: 1%{?dist}
Summary: Note-taking application
Group: User Interface/Desktops
@@ -9,12 +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
-%if 0%{?fedora} < 15
-%global with_panel_applet 1
-%endif
+Patch0: tomboy-1.8.3-ndesk-dbus.patch
BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(gconf-sharp-2.0)
@@ -29,11 +26,6 @@ BuildRequires: pkgconfig(mono-addins-gui)
BuildRequires: pkgconfig(mono-addins-setup)
BuildRequires: pkgconfig(ndesk-dbus-1.0)
BuildRequires: pkgconfig(ndesk-dbus-glib-1.0)
-%if 0%{?with_panel_applet}
-BuildRequires: pkgconfig(gnome-panel-sharp-2.24)
-BuildRequires: pkgconfig(gnome-sharp-2.0)
-BuildRequires: pkgconfig(libpanelapplet-2.0)
-%endif
BuildRequires: mono(Mono.Cairo) = 2.0.0.0
BuildRequires: GConf2
BuildRequires: desktop-file-utils
@@ -147,10 +139,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/mime/packages/tomboy.xml
%{_datadir}/applications/tomboy.desktop
%{_sysconfdir}/gconf/schemas/tomboy.schemas
-%if 0%{?with_panel_applet}
-%{_bindir}/tomboy-panel
-%{_libdir}/bonobo/servers/GNOME_TomboyApplet.server
-%endif
%files devel
@@ -159,10 +147,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
-* Wed Sep 28 2011 Ray <rstrode at redhat.com> - 1.8.0-1
-- Update to 1.8.0
+* Sat Dec 10 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.8.3-1
+- Update to 1.8.3.
+- Remove conditionals not needed anymore.
+- Minor spec file fixes.
-* 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