rpms/monodevelop/devel md-2.3-pcfile.patch, NONE, 1.1 md-2.3-rmcecildeps.patch, NONE, 1.1 md-231-monocecil.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 import.log, 1.31, 1.32 monodevelop.spec, 1.54, 1.55 sources, 1.29, 1.30 md-2.2-pc.patch, 1.1, NONE monodevelop-2.1.0-rmcecildeps.patch, 1.1, NONE
Paul F. Johnson
pfj at fedoraproject.org
Sun May 30 14:00:18 UTC 2010
Author: pfj
Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9123/devel
Modified Files:
.cvsignore import.log monodevelop.spec sources
Added Files:
md-2.3-pcfile.patch md-2.3-rmcecildeps.patch
md-231-monocecil.patch
Removed Files:
md-2.2-pc.patch monodevelop-2.1.0-rmcecildeps.patch
Log Message:
Bump to MD-2.4-beta2
Fix various mono.cecil problems (why can't they just stop being stoopid?)
New pc patch file
md-2.3-pcfile.patch:
monodevelop.pc-new.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE md-2.3-pcfile.patch ---
--- monodevelop-2.3/monodevelop.pc.in 2010-04-29 19:08:20.000000000 +0100
+++ monodevelop-2.3/monodevelop.pc-new.in 2010-05-10 21:43:01.000000000 +0100
@@ -10,4 +10,4 @@
Name: MonoDevelop
Description: Free .NET Development Environment
Version: @VERSION@
-Libs: -r:${libdir}/bin/MonoDevelop.Core.dll -r:${libdir}/bin/MonoDevelop.Ide.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.Ide.dll -r:${libdir}/bin/NRefactory.dll -r:${libdir}/bin/Mono.TextEditor.dll -r:${libdir}/bin/Mono.Debugging.dll
md-2.3-rmcecildeps.patch:
MonoDevelop.AssemblyBrowser/Makefile-new.in | 4 ++--
MonoDevelop.DesignerSupport/Makefile-new.in | 2 +-
MonoDevelop.GtkCore/Makefile-new.in | 4 ++--
MonoDevelop.GtkCore/libsteticui/Makefile-new.in | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE md-2.3-rmcecildeps.patch ---
--- monodevelop-2.3/src/addins/MonoDevelop.DesignerSupport/Makefile.in 2010-05-06 14:19:50.000000000 +0100
+++ monodevelop-2.3/src/addins/MonoDevelop.DesignerSupport/Makefile-new.in 2010-05-10 21:32:39.000000000 +0100
@@ -177,7 +177,6 @@
ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport
ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.DesignerSupport.dll
DEPS = \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
$(top_builddir)/build/bin/MonoDevelop.Ide.dll
@@ -185,6 +184,7 @@
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(MONO_ADDINS_LIBS) \
+ -r:Mono.Cecil.dll \
-r:Mono.Cairo \
-r:Mono.Posix \
-r:System \
--- monodevelop-2.3/src/addins/MonoDevelop.GtkCore/Makefile.in 2010-05-06 14:19:50.000000000 +0100
+++ monodevelop-2.3/src/addins/MonoDevelop.GtkCore/Makefile-new.in 2010-05-10 21:33:37.000000000 +0100
@@ -194,7 +194,6 @@
$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
$(top_builddir)/build/AddIns/MonoDevelop.GtkCore/libsteticui.dll \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
$(top_builddir)/build/bin/Mono.TextEditor.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
$(top_builddir)/build/bin/MonoDevelop.Ide.dll
@@ -206,7 +205,8 @@
$(MONO_ADDINS_LIBS) \
-r:Mono.Posix \
-r:System \
- -r:System.Xml
+ -r:System.Xml \
+ -r:Mono.Cecil.dll
FILES = \
AssemblyInfo.cs \
--- monodevelop-2.3/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in 2010-05-06 14:19:50.000000000 +0100
+++ monodevelop-2.3/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.in 2010-05-10 21:34:48.000000000 +0100
@@ -250,8 +250,7 @@
missing.png
DEPS = \
- ../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
- ../../../../build/bin/Mono.Cecil.dll
+ ../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll
REFS = \
$(GLADE_SHARP_LIBS) \
@@ -261,7 +260,8 @@
-r:System \
-r:System.Core \
-r:System.Runtime.Remoting \
- -r:System.Xml
+ -r:System.Xml \
+ -r:Mono.Cecil.dll
dll_config = libsteticui.dll.config
build_dll_config = $(ADDIN_BUILD)/$(dll_config)
--- monodevelop-2.3/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2010-05-06 14:19:49.000000000 +0100
+++ monodevelop-2.3/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in 2010-05-10 21:35:51.000000000 +0100
@@ -219,7 +219,6 @@
DEPS = \
$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
$(top_builddir)/build/bin/Cecil.Decompiler.dll \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
$(top_builddir)/build/bin/Mono.TextEditor.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
@@ -231,7 +230,8 @@
-r:Mono.Posix \
-r:System \
-r:System.Core \
- -r:System.Xml
+ -r:System.Xml \
+ -r:Mono.Cecil.dll
ADDIN_BUILD = $(top_builddir)/build/AddIns
assemblydir = $(MD_ADDIN_DIR)
md-231-monocecil.patch:
Makefile-new.am | 6 +++---
Makefile-new.in | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE md-231-monocecil.patch ---
--- monodevelop-2.3.1/contrib/Mono.Cecil/Makefile.am 2010-05-21 23:05:31.000000000 +0100
+++ monodevelop-2.3.1/contrib/Mono.Cecil/Makefile-new.am 2010-05-30 13:34:26.000000000 +0100
@@ -10,9 +10,9 @@
CECIL_SNK=$(srcdir)/cecil.snk
CECIL_DIST= $(CECIL_CSFILES) $(CECIL_SNK)
-$(CECIL): $(CECIL_CSFILES)
- mkdir -p $(BINDIR)
- mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
+#$(CECIL): $(CECIL_CSFILES)
+# mkdir -p $(BINDIR)
+# mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
$(CECIL_DEBUG): $(CECIL)
--- monodevelop-2.3.1/contrib/Mono.Cecil/Makefile.in 2010-05-30 13:41:36.000000000 +0100
+++ monodevelop-2.3.1/contrib/Mono.Cecil/Makefile-new.in 2010-05-30 13:41:28.000000000 +0100
@@ -388,9 +388,9 @@
all: $(CECIL) $(CECIL_MDB) $(CECIL_DECOMPILER)
-$(CECIL): $(CECIL_CSFILES)
- mkdir -p $(BINDIR)
- mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
+#$(CECIL): $(CECIL_CSFILES)
+# mkdir -p $(BINDIR)
+# mcs $(CECIL_CSFILES) /keyfile:$(CECIL_SNK) /debug /target:library /out:$(CECIL)
$(CECIL_DEBUG): $(CECIL)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore 19 Mar 2010 22:30:24 -0000 1.29
+++ .cvsignore 30 May 2010 14:00:16 -0000 1.30
@@ -1 +1 @@
-monodevelop-2.2.2.tar.bz2
+monodevelop-2.3.1.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- import.log 19 Mar 2010 22:30:26 -0000 1.31
+++ import.log 30 May 2010 14:00:17 -0000 1.32
@@ -29,3 +29,4 @@ monodevelop-2_2-2_fc13:HEAD:monodevelop-
monodevelop-2_2_1-1_fc13:HEAD:monodevelop-2.2.1-1.fc13.src.rpm:1265310631
monodevelop-2_2_1-2_fc13:HEAD:monodevelop-2.2.1-2.fc13.src.rpm:1266682145
monodevelop-2_2_2-1_fc14:HEAD:monodevelop-2.2.2-1.fc14.src.rpm:1269037735
+monodevelop-2_3_1-1_fc14:HEAD:monodevelop-2.3.1-1.fc14.src.rpm:1275227959
Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- monodevelop.spec 18 Apr 2010 20:06:58 -0000 1.54
+++ monodevelop.spec 30 May 2010 14:00:17 -0000 1.55
@@ -5,8 +5,8 @@
%global nunitver 2.4.8.0
Name: monodevelop
-Version: 2.2.2
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: A full-featured IDE for Mono and Gtk#
Group: Development/Tools
@@ -15,8 +15,9 @@ URL: http://monodevelop.com/
Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
Patch0: md-2.2-unbundle-cecil.patch
Patch1: %{name}-2.1.0-unbundle-nunit.patch
-Patch2: %{name}-2.1.0-rmcecildeps.patch
-Patch3: md-2.2-pc.patch
+Patch2: md-2.3-rmcecildeps.patch
+Patch3: md-2.3-pcfile.patch
+Patch4: md-231-monocecil.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-devel >= 2.4 mono-addins-devel >= 0.4 mono-nunit-devel
@@ -53,10 +54,11 @@ Development files for %{name}.
%prep
%setup -q
-%patch0 -p1 -b .unbundle-cecil
+#%patch0 -p1 -b .unbundle-cecil
%patch1 -p1 -b .unbundle-nunit
-%patch2 -p1 -b .rmcecildeps
+#%patch2 -p1 -b .rmcecildeps
%patch3 -p1 -b .mono-cecil
+%patch4 -p1 -b .monocecil
sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
-e 's!${exec_prefix}/lib!%{_libdir}!' configure
@@ -152,6 +154,13 @@ update-desktop-database &> /dev/null ||
%{_libdir}/pkgconfig/monodevelop*.pc
%changelog
+* Fri May 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.3.1-1
+- Bump to 2.4 beta 2
+
+* Fri May 07 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.3-1
+- Bump to 2.4 beta 1
+- Updated rmcecildeps patch
+
* Sun Apr 18 2010 Christian Krause <chkr at fedoraproject.org> - 2.2.2-2
- Fix monodevelop and mdtool wrapper scripts for x86_64
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 19 Mar 2010 22:30:26 -0000 1.29
+++ sources 30 May 2010 14:00:17 -0000 1.30
@@ -1 +1 @@
-7f01933ede642dbf394147224d0d751e monodevelop-2.2.2.tar.bz2
+4d93b5359b98f477db21918c787375ed monodevelop-2.3.1.tar.bz2
--- md-2.2-pc.patch DELETED ---
--- monodevelop-2.1.0-rmcecildeps.patch DELETED ---
More information about the scm-commits
mailing list