rpms/tomboy/devel tomboy-0.3.5-wrapper.patch, NONE, 1.1 tomboy.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21859

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-0.3.5-wrapper.patch 
Log Message:
* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-3
- Don't run tomboy in the current working directory


tomboy-0.3.5-wrapper.patch:
 tomboy.in |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

--- NEW FILE tomboy-0.3.5-wrapper.patch ---
--- tomboy-0.3.5/Tomboy/tomboy.in.wrapper	2006-02-17 14:25:00.000000000 -0500
+++ tomboy-0.3.5/Tomboy/tomboy.in	2006-02-17 14:25:39.000000000 -0500
@@ -1,18 +1,9 @@
 #!/bin/sh
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
+export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 
-    export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH"
-    export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-
-    THIS_EXE="--debug ./@target@"
-else
-    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-    export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
-
-    THIS_EXE="@pkglibdir@/@target@"
-fi
+THIS_EXE="@pkglibdir@/@target@"
 
 if [ -n "@extragac@" ]; then
     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tomboy.spec	13 Feb 2006 04:09:39 -0000	1.14
+++ tomboy.spec	17 Feb 2006 19:30:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        2
+Release:        3
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -11,6 +11,8 @@
 Source2:      	tomboy-32.png
 Source3:      	tomboy-24.png
 Source4:      	tomboy-16.png
+Patch1:         tomboy-0.3.5-wrapper.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.2.3 atk-devel >= 1.2.4 gnome-panel-devel gtkspell-devel gtk-sharp dbus-sharp gmime-sharp
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .wrapper
 cp %SOURCE3 data/images/tintin.png
 
 %build
@@ -93,6 +96,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-3
+- Don't run tomboy in the current working directory
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
 - Rebuild