rpms/monodevelop/devel mdtool.patch, NONE, 1.1 monodevelop.spec, 1.27, 1.28

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13196/devel

Modified Files:
	monodevelop.spec 
Added Files:
	mdtool.patch 
Log Message:

Added mdtool fix
Removed ikvm-devel BR 


mdtool.patch:

--- NEW FILE mdtool.patch ---
--- monodevelop-1.0/mdtool.in	2008-03-11 02:22:00.000000000 +0000
+++ monodevelop-1.0/mdtool-new.in	2008-04-30 12:54:35.000000000 +0100
@@ -16,7 +16,7 @@
     echo "$ret"
 }
  
-MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+MD_BIN_PATH=@libdir@/monodevelop/bin
 
 ### SYNCH BLOCK: any changes to this block should be kept in sync with the one in Makefile.include and monodevelop.in
 MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- monodevelop.spec	23 Apr 2008 08:50:33 -0000	1.27
+++ monodevelop.spec	30 Apr 2008 12:03:25 -0000	1.28
@@ -8,7 +8,7 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 1.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -16,10 +16,11 @@
 Patch0: monodevelop-libdir.patch
 Patch1: monodevelop-config.patch
 Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch
+Patch3: mdtool.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel subversion-devel desktop-file-utils,boo-devel
+BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel
 BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core
-BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel
+BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview-sharp-devel
 %ifarch !ppc
 BuildRequires: boo-devel
 Requires: boo
@@ -52,6 +53,9 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .orig
+sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH3}
+%patch3 -p1 -b .orig
+sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH3}
 autoreconf -f -i -s
 %patch1 -p1 -b .orig
 %patch2 -p1 -b .use-system-Mono.Cecil
@@ -66,7 +70,7 @@
 sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.in
 sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.am
 sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' src/core/MonoDevelop.Projects/Makefile.in
-# delete prebuilt nunit
+#delete prebuilt nunit
 rm -rf src/addins/NUnit/lib/*
 # Now, copy our built from source nunit. We'd really prefer it just used the system nunit bits
 # but monodevelop is really stubborn.
@@ -74,7 +78,7 @@
 cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/
 
 %build
-%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c
+%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2
 make
 # no smp flags as it falls over during the build (race condition)
 
@@ -129,6 +133,15 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-4
+- mdtool fix
+
+* Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-3
+- remove BR ikvm-devel
+
+* Fri Apr 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-2
+- add in gtksourceview2 support
+
 * Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-1
 - bump to release