rpms/tomboy/devel .cvsignore, 1.32, 1.33 no-start-here.patch, 1.3, 1.4 sources, 1.32, 1.33 tomboy-wrapper.patch, 1.3, 1.4 tomboy.spec, 1.83, 1.84

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Aug 5 05:36:25 UTC 2008


Author: mclasen

Update of /cvs/extras/rpms/tomboy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5448

Modified Files:
	.cvsignore no-start-here.patch sources tomboy-wrapper.patch 
	tomboy.spec 
Log Message:
0.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	14 May 2008 02:57:42 -0000	1.32
+++ .cvsignore	5 Aug 2008 05:35:55 -0000	1.33
@@ -1 +1 @@
-tomboy-0.11.0.tar.bz2
+tomboy-0.11.1.tar.bz2

no-start-here.patch:

Index: no-start-here.patch
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/no-start-here.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- no-start-here.patch	15 Jan 2008 04:16:39 -0000	1.3
+++ no-start-here.patch	5 Aug 2008 05:35:55 -0000	1.4
@@ -1,10 +1,11 @@
-diff -up tomboy-0.9.4/Tomboy/NoteManager.cs.no-start-here tomboy-0.9.4/Tomboy/NoteManager.cs
---- tomboy-0.9.4/Tomboy/NoteManager.cs.no-start-here	2008-01-07 10:13:24.000000000 -0500
-+++ tomboy-0.9.4/Tomboy/NoteManager.cs	2008-01-14 23:15:59.000000000 -0500
-@@ -175,7 +175,6 @@ public NoteManager (string directory) :
+diff -up tomboy-0.11.1/Tomboy/NoteManager.cs.no-start-here tomboy-0.11.1/Tomboy/NoteManager.cs
+--- tomboy-0.11.1/Tomboy/NoteManager.cs.no-start-here	2008-08-02 13:58:45.000000000 -0400
++++ tomboy-0.11.1/Tomboy/NoteManager.cs	2008-08-05 01:34:22.000000000 -0400
+@@ -177,8 +177,6 @@ public NoteManager (string directory) :
+ 				Note links_note = Create (Catalog.GetString ("Using Links in Tomboy"),
  				                          links_note_content);
- 				links_note.QueueSave (true);
- 
+ 				links_note.QueueSave (ChangeType.ContentChanged);
+-
 -				start_note.Window.Show ();
  			} catch (Exception e) {
  				Logger.Warn ("Error creating start notes: {0}\n{1}",


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	14 May 2008 02:57:42 -0000	1.32
+++ sources	5 Aug 2008 05:35:55 -0000	1.33
@@ -1 +1 @@
-a6e37086ec7e797de782a5b957b517f3  tomboy-0.11.0.tar.bz2
+7c1b8db66fa3256603ee39689e65b046  tomboy-0.11.1.tar.bz2

tomboy-wrapper.patch:

Index: tomboy-wrapper.patch
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/tomboy-wrapper.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomboy-wrapper.patch	13 Nov 2007 22:53:17 -0000	1.3
+++ tomboy-wrapper.patch	5 Aug 2008 05:35:55 -0000	1.4
@@ -1,15 +1,12 @@
-diff -up tomboy-0.9.1/Tomboy/tomboy.in.wrapper tomboy-0.9.1/Tomboy/tomboy.in
---- tomboy-0.9.1/Tomboy/tomboy.in.wrapper	2007-11-13 17:52:01.000000000 -0500
-+++ tomboy-0.9.1/Tomboy/tomboy.in	2007-11-13 17:52:19.000000000 -0500
-@@ -1,20 +1,10 @@
- #!/bin/bash
+diff -up tomboy-0.11.1/Tomboy/tomboy.in.wrapper tomboy-0.11.1/Tomboy/tomboy.in
+--- tomboy-0.11.1/Tomboy/tomboy.in.wrapper	2008-08-03 11:44:05.000000000 -0400
++++ tomboy-0.11.1/Tomboy/tomboy.in	2008-08-05 01:32:00.000000000 -0400
+@@ -1,43 +1,32 @@
+ #!/usr/bin/env bash
  
 -if [ "x$PWD" = "x at srcdir@" ] ; then
 -    echo "*** Running uninstalled @target@ ***"
-+export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-+export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
-+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- 
+-
 -    export LD_LIBRARY_PATH="../libtomboy/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:./Addins/PrintNotes/.libs"
 -    export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
 -    export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
@@ -21,8 +18,57 @@
 -    export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 -
 -    THIS_EXE="@pkglibdir@/@target@"
--fi
+-
+-    [ -n "$TOMBOY_DEBUG" ] && TOMBOY_DEBUG="--debug"
+-    [ -n "$TOMBOY_TRACE" ] && TOMBOY_TRACE="--trace=$TOMBOY_TRACE"
+-    [ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
+-
+-    for arg in $*; do
+-        case "x--debug" in ("x$arg")
+-            TOMBOY_DEBUG=$arg
+-        esac
+-
+-        case "x--trace=" in ("x${arg:0:8}")
+-            TOMBOY_TRACE=$arg
+-        esac
+-
+-        case "x--profile=" in ("x${arg:0:10}")
+-            TOMBOY_PROFILE=$arg
+-        esac
+-    done
+-
+-    if [ -n "$TOMBOY_DEBUG" -o -n "$TOMBOY_TRACE" -o -n "$TOMBOY_PROFILE" -o -n "$MONO_EXTRA_ARGS" ]; then
+-        MONO_OPTIONS="$TOMBOY_DEBUG $TOMBOY_TRACE $TOMBOY_PROFILE $MONO_EXTRA_ARGS"
+-        echo "** Running Mono with $MONO_OPTIONS **"
+-    fi
+-
++export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
++export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
++export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
++
 +THIS_EXE="@pkglibdir@/@target@"
++
++[ -n "$TOMBOY_DEBUG" ] && TOMBOY_DEBUG="--debug"
++[ -n "$TOMBOY_TRACE" ] && TOMBOY_TRACE="--trace=$TOMBOY_TRACE"
++[ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
++
++for arg in $*; do
++   case "x--debug" in ("x$arg")
++        TOMBOY_DEBUG=$arg
++   esac
++
++   case "x--trace=" in ("x${arg:0:8}")
++        TOMBOY_TRACE=$arg
++   esac
++
++   case "x--profile=" in ("x${arg:0:10}")
++        TOMBOY_PROFILE=$arg
++   esac
++done
++
++if [ -n "$TOMBOY_DEBUG" -o -n "$TOMBOY_TRACE" -o -n "$TOMBOY_PROFILE" -o -n "$MONO_EXTRA_ARGS" ]; then
++   MONO_OPTIONS="$TOMBOY_DEBUG $TOMBOY_TRACE $TOMBOY_PROFILE $MONO_EXTRA_ARGS"
++echo "** Running Mono with $MONO_OPTIONS **"
+ fi
  
  if [ -n "@extragac@" ]; then
-     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"


Index: tomboy.spec
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- tomboy.spec	7 Jul 2008 16:17:27 -0000	1.83
+++ tomboy.spec	5 Aug 2008 05:35:55 -0000	1.84
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.11.0
-Release: 	4%{?dist}
+Version:        0.11.1
+Release: 	1%{?dist}
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix
 
 Group:          User Interface/Desktops
@@ -119,6 +119,9 @@
 
 
 %changelog
+* Tue Aug  5 2008 Matthias Clasen <mclasen at redhat.com> - 0.11.1-1 
+- Update to 0.11.1
+
 * Sun Jul  6 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.11.0-4
 - rebuild for mono dependencies
 




More information about the fedora-extras-commits mailing list