rpms/monodevelop/devel import.log, 1.2, 1.3 mdtool.patch, 1.1, 1.2 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.2, 1.3 monodevelop-1.9-configure.patch, 1.1, 1.2 monodevelop-1.9-use-system-cecil.patch, 1.1, 1.2 monodevelop-config.patch, 1.6, 1.7 monodevelop-libdir.patch, 1.5, 1.6 monodevelop.spec, 1.31, 1.32
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sat Aug 9 14:27:08 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609/devel
Modified Files:
import.log mdtool.patch
monodevelop-0.19-use-system-Mono.Cecil.patch
monodevelop-1.9-configure.patch
monodevelop-1.9-use-system-cecil.patch
monodevelop-config.patch monodevelop-libdir.patch
monodevelop.spec
Log Message:
Fix to build for F10
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 10 Jul 2008 11:02:26 -0000 1.2
+++ import.log 9 Aug 2008 14:26:37 -0000 1.3
@@ -1,2 +1,3 @@
monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265
monodevelop-1_9-2_fc10:HEAD:monodevelop-1.9-2.fc10.src.rpm:1215687691
+monodevelop-1_9-3_fc10:HEAD:monodevelop-1.9-3.fc10.src.rpm:1218291689
mdtool.patch:
Index: mdtool.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/mdtool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdtool.patch 30 Apr 2008 12:03:25 -0000 1.1
+++ mdtool.patch 9 Aug 2008 14:26:37 -0000 1.2
@@ -8,4 +8,4 @@
+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/
+ MD_PKG_CONFIG_PATH=@gtksharp_prefix@/lib/pkgconfig/:@libdir@/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
monodevelop-0.19-use-system-Mono.Cecil.patch:
Index: monodevelop-0.19-use-system-Mono.Cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-0.19-use-system-Mono.Cecil.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monodevelop-0.19-use-system-Mono.Cecil.patch 8 Jul 2008 10:35:29 -0000 1.2
+++ monodevelop-0.19-use-system-Mono.Cecil.patch 9 Aug 2008 14:26:37 -0000 1.3
@@ -1,7 +1,7 @@
-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 = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-06-30 19:33:45.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.am 2008-08-08 03:51:37.819238210 +0200
+@@ -58,7 +58,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
@@ -10,10 +10,10 @@
-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 = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/Makefile.in 2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/Makefile.in 2008-08-08 03:51:37.823239248 +0200
+@@ -210,7 +210,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(libstetic) \
@@ -22,10 +22,10 @@
-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
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-06-30 19:33:38.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-08-08 03:51:37.826239119 +0200
+@@ -5,7 +5,6 @@
ASSEMBLY_FILES = \
$(ASSEMBLY) \
$(ASSEMBLY_DIR)/libsteticui.dll.mdb \
@@ -33,7 +33,7 @@
$(DATA_FILE_BUILD)
pkglib_DATA = $(ASSEMBLY_FILES)
-@@ -86,7 +85,7 @@ libsteticui_dll_references = \
+@@ -86,7 +85,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(top_builddir)/bin/libstetic.dll \
@@ -42,7 +42,7 @@
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
-@@ -94,7 +93,7 @@ libsteticui_dll_references = \
+@@ -94,7 +93,7 @@
libsteticui_dll_datafiles = libsteticui.dll.config
@@ -51,7 +51,7 @@
RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
-@@ -111,17 +110,9 @@ $(DATA_FILE_BUILD): $(srcdir)/$(notdir $
+@@ -111,17 +110,9 @@
mkdir -p $(ASSEMBLY_DIR)
cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
@@ -70,10 +70,10 @@
- $(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 = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-06-30 19:33:45.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-08-08 03:51:37.829240107 +0200
+@@ -16,7 +16,7 @@
-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 \
@@ -82,10 +82,10 @@
-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 = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-08-08 03:51:37.836240737 +0200
+@@ -199,7 +199,7 @@
-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 \
@@ -94,10 +94,10 @@
-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
+diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am
+--- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.am 2008-06-30 19:34:45.000000000 +0200
++++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am 2008-08-08 03:51:37.840238703 +0200
+@@ -6,8 +6,8 @@
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
@@ -108,10 +108,10 @@
-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
+diff -uraN monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in
+--- monodevelop-1.9.orig/src/core/MonoDevelop.Projects/Makefile.in 2008-07-01 01:33:59.000000000 +0200
++++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in 2008-08-08 03:51:37.845238115 +0200
+@@ -181,8 +181,8 @@
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
monodevelop-1.9-configure.patch:
Index: monodevelop-1.9-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-1.9-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-1.9-configure.patch 8 Jul 2008 10:35:29 -0000 1.1
+++ monodevelop-1.9-configure.patch 9 Aug 2008 14:26:37 -0000 1.2
@@ -1,6 +1,7 @@
---- monodevelop-1.9/configure 2008-07-07 13:23:30.000000000 +0100
-+++ monodevelop-1.9/configure-new 2008-07-07 13:26:34.000000000 +0100
-@@ -4911,7 +4911,7 @@
+diff -uraN monodevelop-1.9.orig/configure monodevelop-1.9/configure
+--- monodevelop-1.9.orig/configure 2008-07-01 01:34:01.000000000 +0200
++++ monodevelop-1.9/configure 2008-08-08 03:54:12.239989660 +0200
+@@ -4796,7 +4796,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -9,21 +10,9 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
---- monodevelop-1.9/monodevelop.pc.in 2008-06-30 18:36:01.000000000 +0100
-+++ monodevelop-1.9/monodevelop.pc.in-new 2008-07-07 13:36:11.000000000 +0100
-@@ -1,8 +1,8 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib/monodevelop
-+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 -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.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
---- monodevelop-1.9/Makefile.am 2008-06-30 18:36:01.000000000 +0100
-+++ monodevelop-1.9/Makefile-new.am 2008-07-07 13:32:57.000000000 +0100
+diff -uraN monodevelop-1.9.orig/Makefile.am monodevelop-1.9/Makefile.am
+--- monodevelop-1.9.orig/Makefile.am 2008-06-30 19:36:01.000000000 +0200
++++ monodevelop-1.9/Makefile.am 2008-08-08 03:54:12.250989094 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = contrib src build po man theme-icons tests
+SUBDIRS = src build po man theme-icons
@@ -39,10 +28,11 @@
pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
if ENABLE_UPDATE_MIMEDB
---- monodevelop-1.9/Makefile.in 2008-07-07 13:23:30.000000000 +0100
-+++ monodevelop-1.9/Makefile-new.in 2008-07-07 13:34:10.000000000 +0100
-@@ -208,7 +208,7 @@
- top_build_prefix = @top_build_prefix@
+diff -uraN monodevelop-1.9.orig/Makefile.in monodevelop-1.9/Makefile.in
+--- monodevelop-1.9.orig/Makefile.in 2008-07-01 01:34:00.000000000 +0200
++++ monodevelop-1.9/Makefile.in 2008-08-08 03:54:12.255988227 +0200
+@@ -207,7 +207,7 @@
+ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = contrib src build po man theme-icons tests
@@ -50,3 +40,17 @@
bin_SCRIPTS = monodevelop mdtool
desktopdir = $(datadir)/applications
desktop_DATA = monodevelop.desktop
+diff -uraN monodevelop-1.9.orig/monodevelop.pc.in monodevelop-1.9/monodevelop.pc.in
+--- monodevelop-1.9.orig/monodevelop.pc.in 2008-06-30 19:36:01.000000000 +0200
++++ monodevelop-1.9/monodevelop.pc.in 2008-08-08 03:54:12.247988943 +0200
+@@ -1,8 +1,8 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib/monodevelop
++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 -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.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
monodevelop-1.9-use-system-cecil.patch:
Index: monodevelop-1.9-use-system-cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-1.9-use-system-cecil.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-1.9-use-system-cecil.patch 8 Jul 2008 10:35:29 -0000 1.1
+++ monodevelop-1.9-use-system-cecil.patch 9 Aug 2008 14:26:37 -0000 1.2
@@ -1,42 +1,46 @@
---- monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.in 2008-07-07 14:11:36.000000000 +0100
-+++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile-new.in 2008-07-07 14:20:21.000000000 +0100
-@@ -181,7 +181,7 @@
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am 2008-06-30 19:34:11.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am 2008-08-08 03:42:53.926239579 +0200
+@@ -41,7 +41,7 @@
+ REFS = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
- $(MONO_ADDINS_LIBS) \
- -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 \
---- monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.am 2008-06-30 18:33:32.000000000 +0100
-+++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile-new.am 2008-07-08 10:41:37.000000000 +0100
-@@ -5,7 +5,7 @@
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2008-08-08 03:42:53.931259663 +0200
+@@ -215,7 +215,7 @@
+ REFS = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
- $(MONO_ADDINS_LIBS) \
- -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 \
---- monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am 2008-06-30 18:34:11.000000000 +0100
-+++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am 2008-07-08 10:54:23.000000000 +0100
-@@ -41,7 +41,7 @@
- REFS = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.DesignerSupport/Makefile.am monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.am
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.DesignerSupport/Makefile.am 2008-06-30 19:33:32.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.am 2008-08-08 03:42:53.920239838 +0200
+@@ -5,7 +5,7 @@
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
+ $(MONO_ADDINS_LIBS) \
- -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 \
---- monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2008-07-08 10:45:54.000000000 +0100
-+++ monodevelop-1.9/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in 2008-07-08 10:53:43.000000000 +0100
-@@ -216,7 +216,7 @@
- REFS = \
+diff -uraN monodevelop-1.9.orig/src/addins/MonoDevelop.DesignerSupport/Makefile.in monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.in
+--- monodevelop-1.9.orig/src/addins/MonoDevelop.DesignerSupport/Makefile.in 2008-07-01 01:33:58.000000000 +0200
++++ monodevelop-1.9/src/addins/MonoDevelop.DesignerSupport/Makefile.in 2008-08-08 03:42:53.917238849 +0200
+@@ -180,7 +180,7 @@
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
+ $(MONO_ADDINS_LIBS) \
- -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 \
monodevelop-config.patch:
Index: monodevelop-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-config.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monodevelop-config.patch 21 Feb 2008 14:37:24 -0000 1.6
+++ monodevelop-config.patch 9 Aug 2008 14:26:37 -0000 1.7
@@ -1,6 +1,7 @@
---- monodevelop-0.19/monodevelop.in 2008-01-30 03:52:39.000000000 +0000
-+++ monodevelop-0.19/monodevelop-new.in 2008-02-21 13:58:50.000000000 +0000
-@@ -52,7 +52,7 @@
+diff -uraN monodevelop-1.9.orig/monodevelop.in monodevelop-1.9/monodevelop.in
+--- monodevelop-1.9.orig/monodevelop.in 2008-06-30 19:36:01.000000000 +0200
++++ monodevelop-1.9/monodevelop.in 2008-08-08 03:40:23.510988731 +0200
+@@ -53,7 +53,7 @@
fi
fi
monodevelop-libdir.patch:
Index: monodevelop-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-libdir.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- monodevelop-libdir.patch 8 Jul 2008 10:35:29 -0000 1.5
+++ monodevelop-libdir.patch 9 Aug 2008 14:26:37 -0000 1.6
@@ -1,6 +1,7 @@
---- monodevelop-0.12/configure.in 2006-09-05 20:36:06.000000000 +0100
-+++ monodevelop-0.12/configure-new.in 2006-09-06 23:33:01.000000000 +0100
-@@ -290,7 +290,7 @@
+diff -uraN monodevelop-1.9.orig/configure.in monodevelop-1.9/configure.in
+--- monodevelop-1.9.orig/configure.in 2008-06-30 19:36:01.000000000 +0200
++++ monodevelop-1.9/configure.in 2008-08-08 03:36:14.161240666 +0200
+@@ -308,7 +308,7 @@
AC_SUBST(CSC_FLAGS)
@@ -9,8 +10,9 @@
MD_ASSEMBLY_DIR="$MD_DIR/bin"
MD_ADDIN_DIR="$MD_DIR/AddIns"
---- monodevelop-0.18.1/monodevelop-core-addins.pc.in 2007-12-20 19:05:52.000000000 +0000
-+++ monodevelop-0.18.1/monodevelop-core-addins-new.pc.in 2008-01-04 00:03:17.000000000 +0000
+diff -uraN monodevelop-1.9.orig/monodevelop-core-addins.pc.in monodevelop-1.9/monodevelop-core-addins.pc.in
+--- monodevelop-1.9.orig/monodevelop-core-addins.pc.in 2008-06-30 19:36:01.000000000 +0200
++++ monodevelop-1.9/monodevelop-core-addins.pc.in 2008-08-08 03:36:14.164239140 +0200
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- monodevelop.spec 10 Jul 2008 11:02:27 -0000 1.31
+++ monodevelop.spec 9 Aug 2008 14:26:37 -0000 1.32
@@ -8,7 +8,7 @@
Summary: A full-featured IDE for Mono and Gtk sharp
Name: monodevelop
Version: 1.9
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Development/Tools
Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -22,7 +22,7 @@
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-devel, gtk-sharp2-devel, intltool, gettext-devel, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview2-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 gtksourceview2-sharp-devel mono-tools-devel
+BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview2-sharp-devel mono-tools-devel gnome-desktop-sharp-devel
%ifarch !ppc
BuildRequires: boo-devel
Requires: boo
@@ -140,9 +140,7 @@
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/mime/generic-icons
-%{_datadir}/mime/globs2
-%{_datadir}/mime/icons
+%{_datadir}/mime/
%files devel
%defattr(-,root,root,-)
@@ -152,6 +150,10 @@
%{__rm} -rf %{buildroot}
%changelog
+* Fri Aug 08 2008 David Nielsen <gnomeuser at gmail.com> - 1.9-3
+- rebase configure patch for fuzz
+- file list fix up
+
* Thu Jul 10 2008 David Nielsen <gnomeuser at gmail.com> 1.9-2
- numerical compare for fedora version test, fixes compile on f10
More information about the fedora-extras-commits
mailing list