[monodevelop] Update to 2.4.2 Don't unbundle Mono.Cecil for now due to incompatible API changes

chkr chkr at fedoraproject.org
Wed Mar 30 20:26:26 UTC 2011


commit 4742d622c4b3232b287919044cd77b1f1ad05e45
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Mar 30 22:26:21 2011 +0200

    Update to 2.4.2
    Don't unbundle Mono.Cecil for now due to incompatible API changes

 .gitignore       |    1 +
 monodevelop.spec |   34 +++++++++++++++++++---------------
 sources          |    2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ca53e6..544d85d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 monodevelop-2.4.tar.bz2
+/monodevelop-2.4.2.tar.bz2
diff --git a/monodevelop.spec b/monodevelop.spec
index 9d2f376..b06dba2 100644
--- a/monodevelop.spec
+++ b/monodevelop.spec
@@ -5,8 +5,8 @@
 %global nunitver    2.4.8.0
 
 Name:           monodevelop
-Version:        2.4
-Release:        2%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -15,7 +15,7 @@ URL:            http://monodevelop.com/
 Source0:        http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-2.1.0-unbundle-nunit.patch
 Patch1:         md-2.3-pcfile.patch
-Patch2:		md-231-monocecil.patch
+Patch2:         md-231-monocecil.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel >= 2.4 mono-addins-devel >= 0.5 mono-nunit-devel
@@ -53,8 +53,8 @@ Development files for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .unbundle-nunit
-%patch1 -p1 -b .mono-cecil
-%patch2 -p1 -b .monocecil
+#%patch1 -p1 -b .mono-cecil
+#%patch2 -p1 -b .monocecil
 
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
     -e 's!${exec_prefix}/lib!%{_libdir}!' configure
@@ -81,16 +81,16 @@ find . -name Makefile.in -or -name \*.pc.in \
          done
 
 for f in `grep -rl 'NUnit/lib/nunit' \`find . -name 'Makefile.in'\``; do
-    sed -i 's|-r:.*NUnit/lib/nunit.|-r:%{_libdir}/mono/1.0/nunit.|' $f
+    sed -i 's|-r:.*NUnit/lib/nunit.|-r:%{_libdir}/mono/2.0/nunit.|' $f
 done
 
-for f in `grep -rl 'Cecil.dll' \`find . -name 'Makefile.in'\``; do
-    sed -i 's|-r:.*Mono.Cecil.dll|-r:%{cecildll}|' $f
-done
-
-for f in `grep -rl 'Cecil.Mdb.dll' \`find . -name 'Makefile.in'\``; do
-    sed -i 's|-r:.*Mono.Cecil.Mdb.dll|-r:%{cecilmdbdll}|' $f
-done
+#for f in `grep -rl 'Cecil.dll' \`find . -name 'Makefile.in'\``; do
+#    sed -i 's|-r:.*Mono.Cecil.dll|-r:%{cecildll}|' $f
+#done
+#
+#for f in `grep -rl 'Cecil.Mdb.dll' \`find . -name 'Makefile.in'\``; do
+#    sed -i 's|-r:.*Mono.Cecil.Mdb.dll|-r:%{cecilmdbdll}|' $f
+#done
 
 
 %build
@@ -98,8 +98,8 @@ done
            --disable-update-desktopdb
 
 # Craziness: NRefactory relies on the bundled Cecil creating build/bin for it
-mkdir -p build/bin
-cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/bin
+# mkdir -p build/bin
+# cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/bin
 
 # Not parallel-buildable
 #make %{?_smp_mflags}
@@ -150,6 +150,10 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Wed Mar 30 2011 Christian Krause <chkr at fedoraproject.org> - 2.4.2-1
+- Update to 2.4.2
+- Don't unbundle Mono.Cecil for now due to incompatible API changes
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 9418c44..bf613c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14deccd526d640cd38482f7ce7c0cb41  monodevelop-2.4.tar.bz2
+05d20deada26a115418cb1b4526b8d15  monodevelop-2.4.2.tar.bz2


More information about the scm-commits mailing list