rpms/monodevelop/F-9 import.log, 1.1, 1.2 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.2, 1.3 monodevelop-1.0.spec, 1.1, 1.2
Paul F. Johnson
pfj at fedoraproject.org
Thu Sep 11 23:32:34 UTC 2008
Author: pfj
Update of /cvs/pkgs/rpms/monodevelop/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30720/F-9
Modified Files:
import.log monodevelop-0.19-use-system-Mono.Cecil.patch
monodevelop-1.0.spec
Log Message:
Rebuild
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 10 Sep 2008 19:50:52 -0000 1.1
+++ import.log 11 Sep 2008 23:32:04 -0000 1.2
@@ -1 +1,2 @@
monodevelop-1_0-6_fc10:F-9:monodevelop-1.0-6.fc10.src.rpm:1221076216
+monodevelop-1_0-6_1_fc10:F-9:monodevelop-1.0-6.1.fc10.src.rpm:1221175889
monodevelop-0.19-use-system-Mono.Cecil.patch:
Index: monodevelop-0.19-use-system-Mono.Cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/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 10 Sep 2008 19:50:52 -0000 1.2
+++ monodevelop-0.19-use-system-Mono.Cecil.patch 11 Sep 2008 23:32:04 -0000 1.3
@@ -1,7 +1,58 @@
-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 @@
+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/l
ib/Makefile src/addins/AspNetAddIn/Makefile src/addins/MonoDevelop.Autotools/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 s
rc/addins/MonoDevelop.Autotools/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"
+
+ 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) \
@@ -10,10 +61,10 @@
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
-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 @@
+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) \
@@ -22,10 +73,10 @@
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
-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 @@
+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 \
@@ -33,7 +84,7 @@
$(DATA_FILE_BUILD)
pkglib_DATA = $(ASSEMBLY_FILES)
-@@ -86,7 +85,7 @@
+@@ -86,7 +85,7 @@ libsteticui_dll_references = \
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(top_builddir)/bin/libstetic.dll \
@@ -42,7 +93,7 @@
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
-@@ -94,7 +93,7 @@
+@@ -94,7 +93,7 @@ libsteticui_dll_references = \
libsteticui_dll_datafiles = libsteticui.dll.config
@@ -51,7 +102,7 @@
RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
-@@ -111,17 +110,9 @@
+@@ -111,17 +110,9 @@ $(DATA_FILE_BUILD): $(srcdir)/$(notdir $
mkdir -p $(ASSEMBLY_DIR)
cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
@@ -70,10 +121,10 @@
- $(DATA_FILES) \
- $(srcdir)/lib/$(CECIL)
+ $(DATA_FILES)
-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 @@
+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 \
@@ -82,10 +133,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 -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 @@
+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 \
@@ -94,10 +145,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 -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 @@
+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) \
@@ -108,10 +159,10 @@
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Posix \
-r:System \
-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 @@
+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) \
Index: monodevelop-1.0.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/F-9/monodevelop-1.0.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-1.0.spec 10 Sep 2008 19:50:52 -0000 1.1
+++ monodevelop-1.0.spec 11 Sep 2008 23:32:04 -0000 1.2
@@ -5,113 +5,98 @@
%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)
-#%(gacutil -l nunit.core | tail -n 2 | grep nunit.core | cut -d "=" -f 2 | cut -d "," -f 1)
-%define nunitver 2.2.10.0
+Summary: A full-featured IDE for Mono and Gtk sharp
+Name: monodevelop
+Version: 1.0
+Release: 6.1%{?dist}
+License: GPLv2+
+Group: Development/Tools
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
+URL: http://www.monodevelop.com/
+Patch0: monodevelop-1.9-libdir.patch
+Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch
+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, 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 gtksourceview-sharp-devel mono-tools-devel
+%ifarch !ppc
+BuildRequires: boo-devel
+Requires: boo
+%endif
+%if 0%{?fedora} > 8
+BuildRequires: mono-addins-devel
+Requires: mono-addins
+%endif
+Requires: mono-core, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite
+Requires: mono-tools
+# ikvm doesn't build from source at the moment. If it does at some point in the future, uncomment this line.
+# Requires: ikvm
-Summary: A full-featured IDE for mono
-Name: monodevelop
-Version: 1.0
-Release: 6%{?dist}
-
-Group: Development/Tools
-License: GPLv2+
-URL: http://monodevelop.com/
-Source0: http://go-mono.com/sources/monodevelop/monodevelop-%{version}.tar.bz2
-Patch0: monodevelop-1.9-libdir.patch
-Patch1: monodevelop-0.19-use-system-Mono.Cecil.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
-BuildRequires: gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
-# for the NUnit add-in
-BuildRequires: mono-nunit22 gtksourceview-sharp-devel
-BuildRequires: autoconf desktop-file-utils intltool
-Requires: mono-addins
-Requires: mono-basic
-# Using system nunit, but dependency not automatically picked up by RPM
-Requires: mono(nunit.core) = 2.2.10.0
-Requires: mono(nunit.framework) = 2.2.10.0
-Requires: monodoc
-Requires: subversion
-Requires: hicolor-icon-theme shared-mime-info
-
-# ppc* not supported: needs mono-nunit which needs nant
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+# Sorry ppc/ppc64. No mono-nunit22 (because of no nant) means no monodevelop.
+excludearch: ppc64 ppc
%description
-This package provides MonoDevelop, a full-featured IDE for Mono with
-syntax colouring, code completion, debugging, project management and
-support for C sharp, Visual Basic.NET, Java, Boo, Nemerle and MSIL.
-
-
-%package devel
-Summary: Development files for monodevelop
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+This package provides MonoDevelop, a full-featured IDE for Mono
+with syntax colouring, code completion, debugging, project
+management and support for C sharp, Visual Basic.NET, Java, Boo,
+Nemerle and MSIL.
+
+%package devel
+Summary: Development files for monodevelop
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
%description devel
-Development files for %{name}.
-
+Development files for monodevelop
%prep
-%setup -q
-%patch0 -p1 -b .libdir
-%patch1 -p1 -b .use-system-cecil
-autoreconf
-
-# Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
-# placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
-# ver__token
-cd src
-for i in \
- addins/MonoDevelop.GtkCore/Makefile.{am,in} \
- addins/MonoDevelop.GtkCore/lib/Makefile.{am,in} \
- addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am \
- addins/MonoDevelop.DesignerSupport/Makefile.{am,in} \
- core/MonoDevelop.Projects/Makefile.{am,in} \
-; do
- sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' "$i"
-done
-
-for i in core/MonoDevelop.Projects/Makefile.{am,in};
-do
- sed -i 's|LONGCECILMDBSTRING|%{cecilmdbver}__%{cecilmdbtoken}|g' "$i"
-done
-
-sed -i addins/NUnit/MonoDevelopNUnit.addin.xml -e 's|LIBDIR|%{_libdir}|'
-
+%setup -q
+%patch0 -p1 -b .orig
+autoreconf -f -i -s
+%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
-%configure --disable-update-mimedb \
- --disable-update-desktopdb \
- --enable-gtksourceview2 --enable-tests
-
-# Not parallel-buildable
-#make %{?_smp_mflags}
+%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2
make
-
-
-%check
-make check
-
+# no smp flags as it falls over during the build (race condition)
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
- GACUTIL_FLAGS="/package monodevelop /root ${RPM_BUILD_ROOT}%{_libdir}"
-
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/monodevelop.desktop
-
+%{__rm} -rf %{buildroot}
+make DESTDIR=%{buildroot} install
%find_lang %{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+desktop-file-install --vendor fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ --add-category X-Fedora \
+ --delete-original \
+ %{buildroot}%{_datadir}/applications/monodevelop.desktop
+
+#remove package mime caches
+%{__rm} -f %{buildroot}%{_datadir}/mime/XMLnamespaces
+%{__rm} -f %{buildroot}%{_datadir}/mime/aliases
+%{__rm} -f %{buildroot}%{_datadir}/mime/application/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/text/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/globs
+%{__rm} -f %{buildroot}%{_datadir}/mime/magic
+%{__rm} -f %{buildroot}%{_datadir}/mime/subclasses
+%{__rm} -f %{buildroot}%{_datadir}/mime/mime.cache
+%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -121,46 +106,33 @@
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{_bindir}/m*
-%{_libdir}/monodevelop
-%{_mandir}/man1/m*
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/
+%defattr (-,root,root,-)
+%{_bindir}/mdtool
+%{_bindir}/monodevelop
+%doc AUTHORS COPYING ChangeLog README
+%{_libdir}/monodevelop/
%{_datadir}/mime/packages/monodevelop.xml
+%{_datadir}/applications/fedora-monodevelop.desktop
+%{_datadir}/man/man1/mdtool.1.gz
+%{_datadir}/man/man1/monodevelop.1.gz
+%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
+%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%files devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/monodevelop*.pc
-
+%{_libdir}/pkgconfig/monodevelop*
+%clean
+%{__rm} -rf %{buildroot}
%changelog
-* Mon Sep 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-6
-- added BR xulrunner-unstable-devel for libgtkmozembed
-
-* Mon Aug 25 2008 Michel Salim <salimma at fedoraproject.org> - 1.9-5
-- Use system-provided nunit
-
-* Sat Aug 23 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.9-4
-- Clean up build dependencies: database support now a separate package
-- Clean up spec file and patches
-
-* 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
-
-* Mon Jul 07 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
-- bump to latest beta for md2
-- fixes to patch files for mono.cecil
-- fix the archs to be mono package happy
-- spec file fixes
+* Fri Sep 12 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6.1
+- rebuild
* Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
- added br mono-tools
More information about the fedora-extras-commits
mailing list