rpms/tomboy/devel tomboy-fix-no-panel-devel.patch, 1.1, 1.2 tomboy.spec, 1.89, 1.90
Tom Callaway
spot at fedoraproject.org
Mon Oct 27 17:35:30 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2339
Modified Files:
tomboy-fix-no-panel-devel.patch tomboy.spec
Log Message:
rebuild for new gnome-sharp
tomboy-fix-no-panel-devel.patch:
Index: tomboy-fix-no-panel-devel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy-fix-no-panel-devel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomboy-fix-no-panel-devel.patch 23 Oct 2008 18:40:48 -0000 1.1
+++ tomboy-fix-no-panel-devel.patch 27 Oct 2008 17:35:29 -0000 1.2
@@ -1,20 +1,16 @@
-Index: configure.in
-===================================================================
---- a/configure.in (revision 2203)
-+++ a/configure.in (revision 2204)
-@@ -145,7 +145,10 @@ if pkg-config --atleast-version=2.23.90
- gnome-sharp-2.0
+diff -up tomboy-0.12.0/configure.in.fix-no-panel-devel tomboy-0.12.0/configure.in
+--- tomboy-0.12.0/configure.in.fix-no-panel-devel 2008-09-22 08:11:22.000000000 -0400
++++ tomboy-0.12.0/configure.in 2008-10-27 13:20:59.000000000 -0400
+@@ -146,6 +146,8 @@ if pkg-config --atleast-version=2.23.90
gconf-sharp-2.0
gconf-sharp-peditors-2.0
-- gnome-panel-sharp-2.24)
-+ gnome-panel-sharp-2.24,
-+ has_fixed_panelapplet="yes",
-+ has_fixed_panelapplet="no")
+ gnome-panel-sharp-2.24)
++ has_fixed_panelapplet="yes"
+
else
if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
PKG_CHECK_MODULES(TOMBOY,
-@@ -160,6 +163,7 @@ else
+@@ -160,6 +162,7 @@ else
gconf-sharp-2.0)
fi
fi
@@ -22,10 +18,9 @@
AC_SUBST(TOMBOY_LIBS)
#
-Index: Tomboy/Applet.cs
-===================================================================
---- a/Tomboy/Applet.cs (revision 2203)
-+++ a/Tomboy/Applet.cs (revision 2204)
+diff -up tomboy-0.12.0/Tomboy/Applet.cs.fix-no-panel-devel tomboy-0.12.0/Tomboy/Applet.cs
+--- tomboy-0.12.0/Tomboy/Applet.cs.fix-no-panel-devel 2008-09-22 08:11:19.000000000 -0400
++++ tomboy-0.12.0/Tomboy/Applet.cs 2008-10-27 13:20:05.000000000 -0400
@@ -5,7 +5,12 @@ using System.Text;
using System.Reflection;
using System.Runtime.InteropServices;
@@ -39,10 +34,42 @@
namespace Tomboy
{
-Index: Tomboy/panelapplet/BonoboUIVerb.cs
-===================================================================
---- a/Tomboy/panelapplet/BonoboUIVerb.cs (revision 0)
-+++ a/Tomboy/panelapplet/BonoboUIVerb.cs (revision 2204)
+diff -up tomboy-0.12.0/Tomboy/Makefile.am.fix-no-panel-devel tomboy-0.12.0/Tomboy/Makefile.am
+--- tomboy-0.12.0/Tomboy/Makefile.am.fix-no-panel-devel 2008-09-22 08:11:19.000000000 -0400
++++ tomboy-0.12.0/Tomboy/Makefile.am 2008-10-27 13:20:05.000000000 -0400
+@@ -17,12 +17,20 @@ if FIXED_GTKSPELL
+ FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
+ endif
+
++if FIXED_PANELAPPLET
++FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
++else
++PANELAPPLET_CSFILES = \
++ $(srcdir)/panelapplet/*.cs
++endif
++
+ CSFLAGS = \
+ -debug \
+ -define:DEBUG \
+ -unsafe \
+ -target:exe \
+ $(DBUS_CSFLAGS) \
++ $(FIXED_PANELAPPLET_CSFLAGS) \
+ $(FIXED_GTKSPELL_CSFLAGS) \
+ $(CSC_DEFINES)
+
+@@ -63,6 +71,8 @@ CSFILES = \
+ $(srcdir)/Notebooks/*.cs \
+ $(srcdir)/Synchronization/*.cs \
+ \
++ $(PANELAPPLET_CSFILES) \
++ \
+ $(srcdir)/Gnome.Keyring/*.cs \
+ \
+ $(DBUS_CSFILES)
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/BonoboUIVerb.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/BonoboUIVerb.cs 2008-10-27 13:20:05.000000000 -0400
@@ -0,0 +1,28 @@
+
+#pragma warning disable 169 // Unused private members
@@ -72,176 +99,9 @@
+ }
+ }
+}
-
-Property changes on: Tomboy/panelapplet/BonoboUIVerb.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/PanelAppletFactory.cs
-===================================================================
---- a/Tomboy/panelapplet/PanelAppletFactory.cs (revision 0)
-+++ a/Tomboy/panelapplet/PanelAppletFactory.cs (revision 2204)
-@@ -0,0 +1,60 @@
-+// Gnome.PanelAppletFactory.cs - PanelAppletFactory class impl
-+//
-+// Copyright (c) 2004-2005 Novell, Inc.
-+//
-+// This code is inserted after the automatically generated code.
-+//
-+// This program is free software; you can redistribute it and/or
-+// modify it under the terms of version 2 of the Lesser GNU General
-+// Public License as published by the Free Software Foundation.
-+//
-+// This program is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+// Lesser General Public License for more details.
-+//
-+// You should have received a copy of the GNU Lesser General Public
-+// License along with this program; if not, write to the
-+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+// Boston, MA 02111-1307, USA.
-+
-+
-+
-+using System;
-+using System.Reflection;
-+using System.Runtime.InteropServices;
-+
-+namespace _Gnome
-+{
-+ public class PanelAppletFactory
-+ {
-+ private PanelAppletFactory () {}
-+
-+ private static string _IID;
-+ private static string _factoryIID;
-+ private static _GnomeSharp.PanelAppletFactoryCallbackWrapper cb_wrapper;
-+
-+ public static void Register (Type applet_type)
-+ {
-+ PanelApplet applet = (PanelApplet) Activator.CreateInstance (applet_type, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance, null, new object[] {IntPtr.Zero}, null);
-+
-+ cb_wrapper = new _GnomeSharp.PanelAppletFactoryCallbackWrapper (new PanelAppletFactoryCallback (Creation));
-+ _IID = applet.IID;
-+ _factoryIID = applet.FactoryIID;
-+ IntPtr native_iid = GLib.Marshaller.StringToPtrGStrdup (_factoryIID);
-+ panel_applet_factory_main (native_iid, ((GLib.GType) applet_type).Val, cb_wrapper.NativeDelegate, IntPtr.Zero);
-+ GLib.Marshaller.Free (native_iid);
-+ }
-+
-+ private static bool Creation (PanelApplet applet, string iid)
-+ {
-+ if (_IID != iid)
-+ return false;
-+ applet.Creation ();
-+ return true;
-+ }
-+
-+ [DllImport("panel-applet-2")]
-+ static extern int panel_applet_factory_main(IntPtr iid, IntPtr applet_type, _GnomeSharp.PanelAppletFactoryCallbackNative cb, IntPtr data);
-+ }
-+}
-
-Property changes on: Tomboy/panelapplet/PanelAppletFactory.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/ChangeSizeHandler.cs
-===================================================================
---- a/Tomboy/panelapplet/ChangeSizeHandler.cs (revision 0)
-+++ a/Tomboy/panelapplet/ChangeSizeHandler.cs (revision 2204)
-@@ -0,0 +1,18 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace _Gnome {
-+
-+ using System;
-+
-+ public delegate void ChangeSizeHandler(object o, ChangeSizeArgs args);
-+
-+ public class ChangeSizeArgs : GLib.SignalArgs {
-+ public uint Size{
-+ get {
-+ return (uint) Args[0];
-+ }
-+ }
-+
-+ }
-+}
-
-Property changes on: Tomboy/panelapplet/ChangeSizeHandler.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/ObjectManager.cs
-===================================================================
---- a/Tomboy/panelapplet/ObjectManager.cs (revision 0)
-+++ a/Tomboy/panelapplet/ObjectManager.cs (revision 2204)
-@@ -0,0 +1,19 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace _GtkSharp.GnomeSharp {
-+
-+ public class ObjectManager {
-+
-+ static bool initialized = false;
-+ // Call this method from the appropriate module init function.
-+ public static void Initialize ()
-+ {
-+ if (initialized)
-+ return;
-+
-+ initialized = true;
-+ GLib.GType.Register (_Gnome.PanelApplet.GType, typeof (_Gnome.PanelApplet));
-+ }
-+ }
-+}
-
-Property changes on: Tomboy/panelapplet/ObjectManager.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/PanelAppletFlags.cs
-===================================================================
---- a/Tomboy/panelapplet/PanelAppletFlags.cs (revision 0)
-+++ a/Tomboy/panelapplet/PanelAppletFlags.cs (revision 2204)
-@@ -0,0 +1,19 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace _Gnome {
-+
-+ using System;
-+ using System.Runtime.InteropServices;
-+
-+ #region Autogenerated code
-+ [Flags]
-+ public enum PanelAppletFlags {
-+
-+ FlagsNone,
-+ ExpandMajor = 1 << 0,
-+ ExpandMinor = 1 << 1,
-+ HasHandle = 1 << 2,
-+ }
-+ #endregion
-+}
-
-Property changes on: Tomboy/panelapplet/PanelAppletFlags.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/ChangeBackgroundHandler.cs
-===================================================================
---- a/Tomboy/panelapplet/ChangeBackgroundHandler.cs (revision 0)
-+++ a/Tomboy/panelapplet/ChangeBackgroundHandler.cs (revision 2204)
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/ChangeBackgroundHandler.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/ChangeBackgroundHandler.cs 2008-10-27 13:20:05.000000000 -0400
@@ -0,0 +1,30 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
@@ -273,16 +133,31 @@
+
+ }
+}
-
-Property changes on: Tomboy/panelapplet/ChangeBackgroundHandler.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs
-===================================================================
---- a/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs (revision 0)
-+++ a/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs (revision 2204)
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/ChangeSizeHandler.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/ChangeSizeHandler.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,18 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace _Gnome {
++
++ using System;
++
++ public delegate void ChangeSizeHandler(object o, ChangeSizeArgs args);
++
++ public class ChangeSizeArgs : GLib.SignalArgs {
++ public uint Size{
++ get {
++ return (uint) Args[0];
++ }
++ }
++
++ }
++}
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs 2008-10-27 13:20:05.000000000 -0400
@@ -0,0 +1,42 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
@@ -326,16 +201,75 @@
+ }
+ #endregion
+}
-
-Property changes on: Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/PanelApplet.cs
-===================================================================
---- a/Tomboy/panelapplet/PanelApplet.cs (revision 0)
-+++ a/Tomboy/panelapplet/PanelApplet.cs (revision 2204)
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,18 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace _Gnome {
++
++ using System;
++
++ public delegate void MoveFocusOutOfAppletHandler(object o, MoveFocusOutOfAppletArgs args);
++
++ public class MoveFocusOutOfAppletArgs : GLib.SignalArgs {
++ public Gtk.DirectionType Direction{
++ get {
++ return (Gtk.DirectionType) Args[0];
++ }
++ }
++
++ }
++}
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/ObjectManager.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/ObjectManager.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,19 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace _GtkSharp.GnomeSharp {
++
++ public class ObjectManager {
++
++ static bool initialized = false;
++ // Call this method from the appropriate module init function.
++ public static void Initialize ()
++ {
++ if (initialized)
++ return;
++
++ initialized = true;
++ GLib.GType.Register (_Gnome.PanelApplet.GType, typeof (_Gnome.PanelApplet));
++ }
++ }
++}
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/PanelAppletBackgroundType.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/PanelAppletBackgroundType.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,17 @@
++// This file was generated by the Gtk# code generator.
++// Any changes made will be lost if regenerated.
++
++namespace _Gnome {
++
++ using System;
++ using System.Runtime.InteropServices;
++
++ #region Autogenerated code
++ public enum PanelAppletBackgroundType {
++
++ NoBackground,
++ ColorBackground,
++ PixmapBackground,
++ }
++ #endregion
++}
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/PanelApplet.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/PanelApplet.cs 2008-10-27 13:20:05.000000000 -0400
@@ -0,0 +1,470 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
@@ -807,17 +741,10 @@
+ #endregion
+ }
+}
-
-Property changes on: Tomboy/panelapplet/PanelApplet.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs
-===================================================================
---- a/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs (revision 0)
-+++ a/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs (revision 2204)
-@@ -0,0 +1,18 @@
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactoryCallback.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactoryCallback.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,10 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
@@ -825,28 +752,77 @@
+
+ using System;
+
-+ public delegate void MoveFocusOutOfAppletHandler(object o, MoveFocusOutOfAppletArgs args);
++ public delegate bool PanelAppletFactoryCallback(_Gnome.PanelApplet applet, string iid);
+
-+ public class MoveFocusOutOfAppletArgs : GLib.SignalArgs {
-+ public Gtk.DirectionType Direction{
-+ get {
-+ return (Gtk.DirectionType) Args[0];
-+ }
++}
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactory.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactory.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,60 @@
++// Gnome.PanelAppletFactory.cs - PanelAppletFactory class impl
++//
++// Copyright (c) 2004-2005 Novell, Inc.
++//
++// This code is inserted after the automatically generated code.
++//
++// This program is free software; you can redistribute it and/or
++// modify it under the terms of version 2 of the Lesser GNU General
++// Public License as published by the Free Software Foundation.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++// Lesser General Public License for more details.
++//
++// You should have received a copy of the GNU Lesser General Public
++// License along with this program; if not, write to the
++// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++// Boston, MA 02111-1307, USA.
++
++
++
++using System;
++using System.Reflection;
++using System.Runtime.InteropServices;
++
++namespace _Gnome
++{
++ public class PanelAppletFactory
++ {
++ private PanelAppletFactory () {}
++
++ private static string _IID;
++ private static string _factoryIID;
++ private static _GnomeSharp.PanelAppletFactoryCallbackWrapper cb_wrapper;
++
++ public static void Register (Type applet_type)
++ {
++ PanelApplet applet = (PanelApplet) Activator.CreateInstance (applet_type, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance, null, new object[] {IntPtr.Zero}, null);
++
++ cb_wrapper = new _GnomeSharp.PanelAppletFactoryCallbackWrapper (new PanelAppletFactoryCallback (Creation));
++ _IID = applet.IID;
++ _factoryIID = applet.FactoryIID;
++ IntPtr native_iid = GLib.Marshaller.StringToPtrGStrdup (_factoryIID);
++ panel_applet_factory_main (native_iid, ((GLib.GType) applet_type).Val, cb_wrapper.NativeDelegate, IntPtr.Zero);
++ GLib.Marshaller.Free (native_iid);
+ }
+
++ private static bool Creation (PanelApplet applet, string iid)
++ {
++ if (_IID != iid)
++ return false;
++ applet.Creation ();
++ return true;
++ }
++
++ [DllImport("panel-applet-2")]
++ static extern int panel_applet_factory_main(IntPtr iid, IntPtr applet_type, _GnomeSharp.PanelAppletFactoryCallbackNative cb, IntPtr data);
+ }
+}
-
-Property changes on: Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/PanelAppletBackgroundType.cs
-===================================================================
---- a/Tomboy/panelapplet/PanelAppletBackgroundType.cs (revision 0)
-+++ a/Tomboy/panelapplet/PanelAppletBackgroundType.cs (revision 2204)
-@@ -0,0 +1,17 @@
+diff -up /dev/null tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFlags.cs
+--- /dev/null 2008-10-27 09:11:22.030040287 -0400
++++ tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFlags.cs 2008-10-27 13:20:05.000000000 -0400
+@@ -0,0 +1,19 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
@@ -856,45 +832,19 @@
+ using System.Runtime.InteropServices;
+
+ #region Autogenerated code
-+ public enum PanelAppletBackgroundType {
++ [Flags]
++ public enum PanelAppletFlags {
+
-+ NoBackground,
-+ ColorBackground,
-+ PixmapBackground,
++ FlagsNone,
++ ExpandMajor = 1 << 0,
++ ExpandMinor = 1 << 1,
++ HasHandle = 1 << 2,
+ }
+ #endregion
+}
-
-Property changes on: Tomboy/panelapplet/PanelAppletBackgroundType.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/panelapplet/PanelAppletFactoryCallback.cs
-===================================================================
---- a/Tomboy/panelapplet/PanelAppletFactoryCallback.cs (revision 0)
-+++ a/Tomboy/panelapplet/PanelAppletFactoryCallback.cs (revision 2204)
-@@ -0,0 +1,10 @@
-+// This file was generated by the Gtk# code generator.
-+// Any changes made will be lost if regenerated.
-+
-+namespace _Gnome {
-+
-+ using System;
-+
-+ public delegate bool PanelAppletFactoryCallback(_Gnome.PanelApplet applet, string iid);
-+
-+}
-
-Property changes on: Tomboy/panelapplet/PanelAppletFactoryCallback.cs
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Tomboy/Tomboy.cs
-===================================================================
---- a/Tomboy/Tomboy.cs (revision 2203)
-+++ a/Tomboy/Tomboy.cs (revision 2204)
+diff -up tomboy-0.12.0/Tomboy/Tomboy.cs.fix-no-panel-devel tomboy-0.12.0/Tomboy/Tomboy.cs
+--- tomboy-0.12.0/Tomboy/Tomboy.cs.fix-no-panel-devel 2008-09-22 08:11:19.000000000 -0400
++++ tomboy-0.12.0/Tomboy/Tomboy.cs 2008-10-27 13:20:05.000000000 -0400
@@ -4,6 +4,12 @@ using System.IO;
using System.Xml;
using Mono.Unix;
@@ -917,37 +867,3 @@
}
static void StartTrayIcon ()
-Index: Tomboy/Makefile.am
-===================================================================
---- a/Tomboy/Makefile.am (revision 2203)
-+++ a/Tomboy/Makefile.am (revision 2204)
-@@ -17,12 +17,20 @@ if FIXED_GTKSPELL
- FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
- endif
-
-+if FIXED_PANELAPPLET
-+FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
-+else
-+PANELAPPLET_CSFILES = \
-+ $(srcdir)/panelapplet/*.cs
-+endif
-+
- CSFLAGS = \
- -debug \
- -define:DEBUG \
- -unsafe \
- -target:exe \
- $(DBUS_CSFLAGS) \
-+ $(FIXED_PANELAPPLET_CSFLAGS) \
- $(FIXED_GTKSPELL_CSFLAGS) \
- $(CSC_DEFINES)
-
-@@ -63,6 +71,8 @@ CSFILES = \
- $(srcdir)/Notebooks/*.cs \
- $(srcdir)/Synchronization/*.cs \
- \
-+ $(PANELAPPLET_CSFILES) \
-+ \
- $(srcdir)/Gnome.Keyring/*.cs \
- \
- $(DBUS_CSFILES)
Index: tomboy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- tomboy.spec 23 Oct 2008 18:40:48 -0000 1.89
+++ tomboy.spec 27 Oct 2008 17:35:29 -0000 1.90
@@ -1,6 +1,6 @@
Name: tomboy
Version: 0.12.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tomboy is a desktop note-taking application for Linux and Unix
Group: User Interface/Desktops
@@ -54,6 +54,8 @@
%patch2 -p1 -b .no-start-here
%patch3 -p1 -b .fill-empty-lines
%patch4 -p1 -b .fix-no-panel-devel
+autoconf
+automake
%build
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -137,6 +139,9 @@
%changelog
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.12.0-4
+- rebuild for new gnome-sharp
+
* Thu Oct 23 2008 Ray Strode <rstrode at redhat.com> - 0.12.0-3
- Apply upstream patch to fix crasher when gnome-panel-devel
isn't installed.
More information about the scm-commits
mailing list