rpms/monodevelop/devel import.log, NONE, 1.1 monodevelop-1.9-configure.patch, NONE, 1.1 monodevelop-1.9-use-system-cecil.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 monodevelop-0.19-use-system-Mono.Cecil.patch, 1.1, 1.2 monodevelop-libdir.patch, 1.4, 1.5 monodevelop.spec, 1.29, 1.30 sources, 1.9, 1.10
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Tue Jul 8 10:36:25 UTC 2008
- Previous message (by thread): rpms/bip/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message (by thread): rpms/smbldap-tools/F-9 smbldap-tools-0.9.5-chown.patch, NONE, 1.1 smbldap-tools-0.9.5-config.patch, NONE, 1.1 smbldap-tools-0.9.5-utf-8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 smbldap-tools.spec, 1.7, 1.8 sources, 1.4, 1.5 smbldap-tools-0.9.4-config.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13194/devel
Modified Files:
.cvsignore monodevelop-0.19-use-system-Mono.Cecil.patch
monodevelop-libdir.patch monodevelop.spec sources
Added Files:
import.log monodevelop-1.9-configure.patch
monodevelop-1.9-use-system-cecil.patch
Log Message:
Bump to the first beta for MD2 - lots of changes, most for the better!
--- NEW FILE import.log ---
monodevelop-1_9-1_fc10:HEAD:monodevelop-1.9-1.fc10.src.rpm:1215513265
monodevelop-1.9-configure.patch:
--- NEW FILE monodevelop-1.9-configure.patch ---
--- 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 @@
{ (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/Mono.Debugging/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/Makefil!
e src/addins/MonoDevelop.GtkCore/lib/Makefile src/addins/AspNe!
tAddIn/M
akefile 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/GnomePlatform/Makefile src/addins/MacPlatform/Makefile src/addins/WindowsPlatform/Makefile src/addins/MonoDevelop.AssemblyBrowser/Makefile src/addins/Mono.Texteditor/Makefile src/addins/MonoDevelop.SourceEditor2/Makefile src/addins/MonoDevelop.Moonlight/Makefile src/addins/MonoDevelop.XmlEditor/Makefile src/addins/MonoDevelop.CodeMetrics/Makefile src/addins/MonoDevelop.Debugger/Makefile tests/Makefile tests/UnitTests/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/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
--- 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
@@ -1,4 +1,4 @@
-SUBDIRS = contrib src build po man theme-icons tests
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
@@ -12,7 +12,7 @@
pkgconfig_in_files = monodevelop.pc.in monodevelop-core-addins.pc.in
-pkgconfigdir= $(prefix)/lib/pkgconfig
+pkgconfigdir= $(libdir)/pkgconfig
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@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = contrib src build po man theme-icons tests
+SUBDIRS = src build po man theme-icons
bin_SCRIPTS = monodevelop mdtool
desktopdir = $(datadir)/applications
desktop_DATA = monodevelop.desktop
monodevelop-1.9-use-system-cecil.patch:
--- NEW FILE monodevelop-1.9-use-system-cecil.patch ---
--- 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 @@
$(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 @@
$(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 = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_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 = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_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 \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 23 Apr 2008 08:50:33 -0000 1.9
+++ .cvsignore 8 Jul 2008 10:35:29 -0000 1.10
@@ -1 +1 @@
-monodevelop-1.0.tar.bz2
+monodevelop-1.9.tar.bz2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodevelop-0.19-use-system-Mono.Cecil.patch 11 Apr 2008 19:34:59 -0000 1.1
+++ monodevelop-0.19-use-system-Mono.Cecil.patch 8 Jul 2008 10:35:29 -0000 1.2
@@ -1,54 +1,3 @@
-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/MonoD!
evelop.A
utotools/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/Makef!
ile 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/MonoDeve!
lop.Desi
gnerSupport/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
monodevelop-libdir.patch:
Index: monodevelop-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-libdir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monodevelop-libdir.patch 17 Jan 2008 10:18:35 -0000 1.4
+++ monodevelop-libdir.patch 8 Jul 2008 10:35:29 -0000 1.5
@@ -9,31 +9,6 @@
MD_ASSEMBLY_DIR="$MD_DIR/bin"
MD_ADDIN_DIR="$MD_DIR/AddIns"
---- monodevelop-0.12/Makefile.am 2006-09-05 20:36:06.000000000 +0100
-+++ monodevelop-0.12/Makefile-new.am 2006-09-06 23:33:26.000000000 +0100
-@@ -15,7 +15,7 @@
-
- pkgconfig_in_files = monodevelop.pc.in
-
--pkgconfigdir= $(prefix)/lib/pkgconfig
-+pkgconfigdir= $(libdir)/pkgconfig
- pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
-
- if ENABLE_UPDATE_MIMEDB
-
-
-
-
---- monodevelop-0.18/monodevelop.pc.in 2007-12-19 14:54:07.000000000 +0000
-+++ monodevelop-0.18/monodevelop-new.pc.in 2007-12-19 14:57:15.000000000 +0000
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib/monodevelop
-+libdir=@libdir@/monodevelop
-
- Name: MonoDevelop
- Description: Free .NET Development Environment
--- 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
@@ -1,6 +1,6 @@
Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- monodevelop.spec 7 Jul 2008 19:12:01 -0000 1.29
+++ monodevelop.spec 8 Jul 2008 10:35:29 -0000 1.30
@@ -7,8 +7,8 @@
Summary: A full-featured IDE for Mono and Gtk sharp
Name: monodevelop
-Version: 1.0
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -17,6 +17,8 @@
Patch1: monodevelop-config.patch
Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch
Patch3: mdtool.patch
+Patch4: monodevelop-1.9-configure.patch
+Patch5: monodevelop-1.9-use-system-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, gtksourceview2-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel
BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core
@@ -25,17 +27,16 @@
BuildRequires: boo-devel
Requires: boo
%endif
-%if 0%{?fedora} > 8
+%if "%{?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-core, monodoc, gecko-sharp2, gtksourceview2-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
-
+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
@@ -57,9 +58,15 @@
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
+%patch4 -p1 -b .configure
+
+# rebuild conffiles
+autoreconf -f -i -s
+
%patch2 -p1 -b .use-system-Mono.Cecil
+%patch5 -p1 -b .use-system-mono-1.9
+
# 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
@@ -69,9 +76,14 @@
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|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.DesignerSupport/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.DesignerSupport/Makefile.am
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.AssemblyBrowser/Makefile.in
+sed -i 's|LONGCECILSTRING|%{cecilver}__%{ceciltoken}|g' src/addins/MonoDevelop.AssemblyBrowser/Makefile.am
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.
@@ -79,7 +91,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 --enable-gtksourceview2
+%configure --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 --enable-monoextensions
make
# no smp flags as it falls over during the build (race condition)
@@ -128,6 +140,9 @@
%{_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
%files devel
%defattr(-,root,root,-)
@@ -137,8 +152,11 @@
%{__rm} -rf %{buildroot}
%changelog
-* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-7
-- fix conditional comparison
+* 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
* Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
- added br mono-tools
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 23 Apr 2008 08:50:33 -0000 1.9
+++ sources 8 Jul 2008 10:35:29 -0000 1.10
@@ -1 +1 @@
-537e8a1d11d59714f955b95f86ac479b monodevelop-1.0.tar.bz2
+9e2b52ad41101f1e56dee8200b181dd5 monodevelop-1.9.tar.bz2
- Previous message (by thread): rpms/bip/EL-5 .cvsignore,1.2,1.3 sources,1.2,1.3
- Next message (by thread): rpms/smbldap-tools/F-9 smbldap-tools-0.9.5-chown.patch, NONE, 1.1 smbldap-tools-0.9.5-config.patch, NONE, 1.1 smbldap-tools-0.9.5-utf-8.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 smbldap-tools.spec, 1.7, 1.8 sources, 1.4, 1.5 smbldap-tools-0.9.4-config.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list