rpms/tomboy/devel tomboy-wrapper.patch, 1.4, 1.5 tomboy.spec, 1.92, 1.93 tomboy-fix-no-panel-devel.patch, 1.2, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/tomboy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30985

Modified Files:
	tomboy-wrapper.patch tomboy.spec 
Removed Files:
	tomboy-fix-no-panel-devel.patch 
Log Message:
0.13.1


tomboy-wrapper.patch:

Index: tomboy-wrapper.patch
===================================================================
RCS file: /cvs/extras/rpms/tomboy/devel/tomboy-wrapper.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomboy-wrapper.patch	5 Aug 2008 05:35:55 -0000	1.4
+++ tomboy-wrapper.patch	4 Dec 2008 03:03:59 -0000	1.5
@@ -1,7 +1,7 @@
-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 @@
+diff -up tomboy-0.13.1/Tomboy/tomboy.in.wrapper tomboy-0.13.1/Tomboy/tomboy.in
+--- tomboy-0.13.1/Tomboy/tomboy.in.wrapper	2008-12-03 21:54:48.000000000 -0500
++++ tomboy-0.13.1/Tomboy/tomboy.in	2008-12-03 21:55:10.000000000 -0500
+@@ -1,14 +1,5 @@
  #!/usr/bin/env bash
  
 -if [ "x$PWD" = "x at srcdir@" ] ; then
@@ -13,62 +13,14 @@
 -
 -    THIS_EXE="--debug ./@target@"
 -else
--    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
--
-+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
+     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@"
+@@ -38,7 +29,6 @@ else
+         echo "** Running Mono with $MONO_OPTIONS **"
+     fi
+ 
+-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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- tomboy.spec	22 Nov 2008 05:12:06 -0000	1.92
+++ tomboy.spec	4 Dec 2008 03:03:59 -0000	1.93
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.12.0
-Release: 	6%{?dist}
+Version:        0.13.1
+Release: 	1%{?dist}
 Summary:        Note-taking application
 
 Group:          User Interface/Desktops
@@ -9,11 +9,10 @@
 # libtomboy contains GPL+ code
 # Mono.Addins is MIT
 URL:            http://projects.gnome.org/tomboy/
-Source0:        http://download.gnome.org/sources/tomboy/0.12/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/tomboy/0.13/%{name}-%{version}.tar.bz2
 Patch1:         tomboy-wrapper.patch
 Patch2:		no-start-here.patch
 Patch3:		tomboy-0.11.0-fill-empty-lines.patch
-Patch4:		tomboy-fix-no-panel-devel.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,9 +49,8 @@
 %patch1 -p1 -b .wrapper
 %patch2 -p1 -b .no-start-here
 %patch3 -p1 -b .fill-empty-lines
-%patch4 -p1 -b .fix-no-panel-devel
-autoconf
-automake
+
+autoreconf -f -i
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -136,6 +134,9 @@
 
 
 %changelog
+* Wed Dec  3 2008 Matthias Clasen <mclasen at redhat.com> - 0.13.1-1
+- Update to 0.13.1
+
 * Sat Nov 22 2008 Matthias Clasen <mclasen at redhat.com> - 0.12.0-6
 - Better URL
 - Tweak %%description


--- tomboy-fix-no-panel-devel.patch DELETED ---