rpms/monodevelop/devel monodevelop-0.19-use-system-Mono.Cecil.patch, NONE, 1.1 monodevelop.spec, 1.22, 1.23
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Apr 11 19:36:01 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5665
Modified Files:
monodevelop.spec
Added Files:
monodevelop-0.19-use-system-Mono.Cecil.patch
Log Message:
- use system Mono.Cecil
- use copies of built from source nunit22 rather than bundling (upstream should really uncouple this)
monodevelop-0.19-use-system-Mono.Cecil.patch:
--- NEW FILE monodevelop-0.19-use-system-Mono.Cecil.patch ---
diff -up monodevelop-0.19/configure.use-system-Mono.Cecil monodevelop-0.19/configure
--- monodevelop-0.19/configure.use-system-Mono.Cecil 2008-04-11 14:11:37.000000000 -0400
+++ monodevelop-0.19/configure 2008-04-11 14:11:41.000000000 -0400
@@ -4742,7 +4742,7 @@ echo "$as_me: error: You must enable one
{ (exit 1); exit 1; }; }
fi
-ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/!
MonoDevelop.Startup/Makefile src/tools/Makefile src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/!
lib/Makefile src/addins/AspNetAddIn/Makefile src/addins/MonoDe!
velop.Au
totools/Makefile src/addins/MonoDevelop.DesignerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
+ac_config_files="$ac_config_files build/data/Makefile build/data/resources/css/Makefile build/data/resources/Makefile build/Makefile src/Makefile src/core/Makefile src/core/NRefactory/Makefile src/core/MonoDevelop.Core/AssemblyInfo.cs src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Core.Gui/AssemblyInfo.cs src/core/MonoDevelop.Core.Gui/Makefile src/core/MonoDevelop.Projects/AssemblyInfo.cs src/core/MonoDevelop.Projects/MonoDevelop.Projects.dll.config src/core/MonoDevelop.Projects/Makefile src/core/MonoDevelop.Projects.Gui/AssemblyInfo.cs src/core/MonoDevelop.Projects.Gui/Makefile src/core/MonoDevelop.Documentation/AssemblyInfo.cs src/core/MonoDevelop.Documentation/Makefile src/core/MonoDevelop.Ide/AssemblyInfo.cs src/core/MonoDevelop.Ide/Makefile src/core/MonoDevelop.Dock/Makefile src/core/MonoDevelop.Components/AssemblyInfo.cs src/core/MonoDevelop.Components/Makefile src/core/MonoDevelop.Startup/AssemblyInfo.cs src/core/MonoDevelop.Startup/Makefile src/tools/Makefi!
le src/tools/mdhost/Makefile src/tools/mdrun/Makefile src/tools/SharpCoco/Makefile src/addins/Makefile src/addins/MonoDeveloperExtensions/Makefile src/addins/MonoDeveloperExtensions/NUnit/Makefile src/addins/NUnit/Makefile src/addins/VersionControl/Diff/Makefile src/addins/VersionControl/DiffWidget/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile src/addins/ILAsmBinding/Makefile src/addins/VBNetBinding/Makefile src/addins/MonoDevelop.SourceEditor/AssemblyInfo.cs src/addins/MonoDevelop.SourceEditor/Makefile src/addins/prj2make-sharp-lib/AssemblyInfo.cs src/addins/prj2make-sharp-lib/Makefile src/addins/WelcomePage/Makefile src/addins/ChangeLogAddIn/Makefile src/addins/MonoDevelop.GtkCore/Makefile src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNetAddIn/Makefile !
src/addins/MonoDevelop.Autotools/Makefile src/addins/MonoDevel!
op.Desig
nerSupport/Makefile src/addins/MonoDevelop.WebReferences/Makefile src/addins/Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment/Makefile src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile src/addins/MonoDevelop.Gettext/Makefile src/addins/MonoDevelop.RegexToolkit/Makefile src/addins/CBinding/Makefile src/addins/SourceEditor2/AssemblyInfo.cs src/addins/SourceEditor2/Makefile src/addins/GnomePlatform/Makefile src/addins/MacPlatform/Makefile Makefile monodevelop mdtool monodevelop.pc monodevelop-core-addins.pc po/Makefile man/Makefile theme-icons/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -5415,8 +5415,6 @@ do
"build/data/resources/css/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/css/Makefile" ;;
"build/data/resources/Makefile") CONFIG_FILES="$CONFIG_FILES build/data/resources/Makefile" ;;
"build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
- "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
- "contrib/Mono.Cecil/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Mono.Cecil/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/core/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/Makefile" ;;
"src/core/NRefactory/Makefile") CONFIG_FILES="$CONFIG_FILES src/core/NRefactory/Makefile" ;;
diff -up monodevelop-0.19/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/Makefile.am
--- monodevelop-0.19/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:11:33.000000000 -0400
+++ monodevelop-0.19/Makefile.am 2008-04-11 14:11:41.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = contrib src build po man theme-icons
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
diff -up monodevelop-0.19/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/Makefile.in
--- monodevelop-0.19/Makefile.in.use-system-Mono.Cecil 2008-04-11 14:11:41.000000000 -0400
+++ monodevelop-0.19/Makefile.in 2008-04-11 14:11:41.000000000 -0400
@@ -206,7 +206,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = contrib src build po man theme-icons
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
desktopdir = $(datadir)/applications
desktop_DATA = monodevelop.desktop
diff -up monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil monodevelop-0.19/monodevelop.pc.in
--- monodevelop-0.19/monodevelop.pc.in.use-system-Mono.Cecil 2008-04-11 14:11:33.000000000 -0400
+++ monodevelop-0.19/monodevelop.pc.in 2008-04-11 14:11:41.000000000 -0400
@@ -5,4 +5,4 @@ libdir=@libdir@/monodevelop
Name: MonoDevelop
Description: Free .NET Development Environment
Version: @VERSION@
-Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.Cecil.dll
+Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Core.Gui.dll -r:${libdir}/bin/MonoDevelop.Projects.dll -r:${libdir}/bin/MonoDevelop.Projects.Gui.dll -r:${libdir}/bin/MonoDevelop.Ide.dll -r:${libdir}/bin/MonoDevelop.Components.dll -r:${libdir}/bin/NRefactory.dll
diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:14:35.000000000 -0400
+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-04-11 14:14:49.000000000 -0400
@@ -58,7 +58,7 @@ libsteticui_REFERENCES = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in.use-system-Mono.Cecil 2008-04-11 14:14:04.000000000 -0400
+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/Makefile.in 2008-04-11 14:14:20.000000000 -0400
@@ -209,7 +209,7 @@ libsteticui_REFERENCES = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:12:49.000000000 -0400
+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-04-11 14:13:42.000000000 -0400
@@ -5,7 +5,6 @@ ASSEMBLY = $(ASSEMBLY_DIR)/libsteticui.d
ASSEMBLY_FILES = \
$(ASSEMBLY) \
$(ASSEMBLY_DIR)/libsteticui.dll.mdb \
- $(CECIL_DLL) \
$(DATA_FILE_BUILD)
pkglib_DATA = $(ASSEMBLY_FILES)
@@ -86,7 +85,7 @@ libsteticui_dll_references = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(top_builddir)/bin/libstetic.dll \
- -r:$(top_srcdir)/libsteticui/lib/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
@@ -94,7 +93,7 @@ libsteticui_dll_references = \
libsteticui_dll_datafiles = libsteticui.dll.config
-all: $(ASSEMBLY) $(DATA_FILE_BUILD) $(CECIL_DLL)
+all: $(ASSEMBLY) $(DATA_FILE_BUILD)
RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
@@ -111,17 +110,9 @@ $(DATA_FILE_BUILD): $(srcdir)/$(notdir $
mkdir -p $(ASSEMBLY_DIR)
cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
-CECIL = Mono.Cecil.dll
-CECIL_DLL = $(ASSEMBLY_DIR)/$(CECIL)
-
-$(CECIL_DLL): $(srcdir)/lib/$(CECIL)
- mkdir -p $(ASSEMBLY_DIR)
- cp $(srcdir)/lib/$(CECIL) $(ASSEMBLY_DIR)/.
-
CLEANFILES = $(ASSEMBLY_FILES) sources.rsp
EXTRA_DIST = \
$(libsteticui_dll_sources) \
$(RESOURCE_FILES) \
- $(DATA_FILES) \
- $(srcdir)/lib/$(CECIL)
+ $(DATA_FILES)
diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:15:11.000000000 -0400
+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-04-11 14:15:32.000000000 -0400
@@ -16,7 +16,7 @@ REFS = \
-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff -up monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in
--- monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-Mono.Cecil 2008-04-11 14:11:39.000000000 -0400
+++ monodevelop-0.19/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-04-11 14:11:41.000000000 -0400
@@ -198,7 +198,7 @@ REFS = \
-r:$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am
--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am.use-system-Mono.Cecil 2008-04-11 14:16:34.000000000 -0400
+++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.am 2008-04-11 14:16:55.000000000 -0400
@@ -6,8 +6,8 @@ CONFIG = MonoDevelop.Projects.dll.config
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Posix \
-r:System \
diff -up monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in
--- monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in.use-system-Mono.Cecil 2008-04-11 14:16:02.000000000 -0400
+++ monodevelop-0.19/src/core/MonoDevelop.Projects/Makefile.in 2008-04-11 14:16:27.000000000 -0400
@@ -180,8 +180,8 @@ CONFIG = MonoDevelop.Projects.dll.config
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Posix \
-r:System \
Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- monodevelop.spec 21 Feb 2008 15:18:37 -0000 1.22
+++ monodevelop.spec 11 Apr 2008 19:34:59 -0000 1.23
@@ -1,17 +1,23 @@
+%define cecilver %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 2 | cut -d "," -f 1)
+%define ceciltoken %(gacutil -l Mono.Cecil |grep Mono.Cecil | cut -d "=" -f 4)
+%define cecilmdbver %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 2 | cut -d "," -f 1)
+%define cecilmdbtoken %(gacutil -l Mono.Cecil.Mdb |grep Mono.Cecil.Mdb | cut -d "=" -f 4)
+
Summary: A full-featured IDE for Mono and Gtk sharp
Name: monodevelop
Version: 0.19
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv2+
Group: Development/Tools
Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
URL: http://www.monodevelop.com/
Patch0: monodevelop-libdir.patch
Patch1: monodevelop-config.patch
+Patch2: monodevelop-0.19-use-system-Mono.Cecil.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
BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel
-BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit
+BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit
%ifarch !ppc
BuildRequires: boo-devel
Requires: boo
@@ -43,6 +49,24 @@
%patch0 -p1 -b .orig
autoreconf -f -i -s
%patch1 -p1 -b .orig
+%patch2 -p1 -b .use-system-Mono.Cecil
+# Here is where we replace the LONGCECILSTRING LONGCECILMDBSTRING placeholders with the actual
+# values for the Mono.Cecil and Mono.Cecil.Mdb ver__token
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.GtkCore/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/core/MonoDevelop.Projects/Makefile.am
+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
+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.
+cp %{_libdir}/mono/nunit22/nunit.core.dll src/addins/NUnit/lib/
+cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/
%build
%ifarch !ppc
@@ -104,6 +128,10 @@
%{__rm} -rf %{buildroot}
%changelog
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
+- use system Mono.Cecil
+- use copies of built from source nunit22 rather than bundling (upstream should really uncouple this)
+
* Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.19-2
- added BR update-desktop-database
More information about the fedora-extras-commits
mailing list