[tomboy] Update to 1.7.0. Add BR on libX11-devel.
Thomas Moschny
thm at fedoraproject.org
Thu Jun 16 00:01:32 UTC 2011
commit 3caabfb10be4f4538c6c8ff46a07bdc7e51323f4
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Thu Jun 16 02:00:44 2011 +0200
Update to 1.7.0.
Add BR on libX11-devel.
.gitignore | 1 +
sources | 2 +-
tomboy-1.7.0-ndesk-dbus.patch | 152 +++++++++++++++++++++++++++++++++++++++++
tomboy.spec | 22 ++++--
4 files changed, 168 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e6421f..ead47b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ tomboy-1.3.1.tar.bz2
/tomboy-1.5.0.tar.bz2
/tomboy-1.5.2.tar.bz2
/tomboy-1.6.0.tar.bz2
+/tomboy-1.7.0.tar.bz2
diff --git a/sources b/sources
index 15360a4..399d4f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17bff34cffbdb55601de6a91c4f75431 tomboy-1.6.0.tar.bz2
+e652e26f3457249914743b800d071a3f tomboy-1.7.0.tar.bz2
diff --git a/tomboy-1.7.0-ndesk-dbus.patch b/tomboy-1.7.0-ndesk-dbus.patch
new file mode 100644
index 0000000..b72d89f
--- /dev/null
+++ b/tomboy-1.7.0-ndesk-dbus.patch
@@ -0,0 +1,152 @@
+--- 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
+@@ -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)
+
+ #
+--- a/configure
++++ b/configure
+@@ -13632,7 +13632,7 @@
+
+
+ #
+-# Check for dbus-sharp
++# Check for NDesk DBus
+ #
+
+ pkg_failed=no
+@@ -13643,12 +13643,12 @@
+ 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`
+ else
+ pkg_failed=yes
+ fi
+@@ -13659,12 +13659,12 @@
+ 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`
+ else
+ pkg_failed=yes
+ fi
+@@ -13684,14 +13684,14 @@
+ _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`
+ 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`
+ 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 --git a/tomboy.spec b/tomboy.spec
index 73008a1..edad84e 100644
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 1.6.0
+Version: 1.7.0
Release: 1%{?dist}
Summary: Note-taking application
Group: User Interface/Desktops
@@ -9,8 +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/tomboy/1.6/%{name}-%{version}.tar.bz2
-
+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
%if 0%{?fedora} < 15
%global with_panel_applet 1
%endif
@@ -40,6 +41,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gnome-doc-utils
BuildRequires: intltool
+BuildRequires: libX11-devel
Requires: gtkspell
Requires(pre): GConf2
@@ -68,6 +70,7 @@ to develop addins that add new functionality to tomboy.
%prep
%setup -q
+%patch0 -p1
# Convert to utf-8
for file in ChangeLog ; do
@@ -88,7 +91,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=%{buildroot} INSTALL="install -p"
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -delete
chmod a+x %{buildroot}%{_libdir}/%{name}/*.exe
chmod a+x %{buildroot}%{_libdir}/%{name}/addins/*.dll
@@ -97,10 +100,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/tomboy.desktop
%find_lang %name --with-gnome
-cd %{buildroot}%{_datadir}/mime
-for i in *; do
- if [ ! "$i" = "packages" ]; then
- rm -rf ./$i
+for i in %{buildroot}%{_datadir}/mime/*; do
+ if [ ! "${i##*/}" = "packages" ]; then
+ rm -rf $i
fi
done
@@ -157,6 +159,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
+* Wed Jun 15 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.7.0-1
+- Update to 1.7.0.
+- Add BR on libX11-devel.
+
* Thu Jun 2 2011 Thomas Moschny <thomas.moschny at gmx.de> - 1.6.0-1
- Update to 1.6.0, also fixes CVE-2010-4005.
- Simply create the missing dir instead of patching Makefile.am.
More information about the scm-commits
mailing list