rpms/monodevelop/devel monodevelop-210-nunitmakes.patch, NONE, 1.1 monodevelop-210-usececil.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 import.log, 1.23, 1.24 monodevelop-192-nunit.patch, 1.1, 1.2 monodevelop-2.spec, 1.19, 1.20 sources, 1.24, 1.25 md-192-desktop.patch, 1.1, NONE monodevelop-1.9.1-use-mono-cecil.patch, 1.1, NONE monodevelop-191-usemonocecil.patch, 1.2, NONE
Paul F. Johnson
pfj at fedoraproject.org
Wed Sep 9 22:24:14 UTC 2009
- Previous message (by thread): rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.34,1.35
- Next message (by thread): rpms/gtk-sharp2/devel gtksharp-2129-docfix.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.15, 1.16 gtk-sharp2.spec, 1.45, 1.46 sources, 1.15, 1.16 gtk-sharp-2.10.0-libdir.patch, 1.1, NONE gtk-sharp-2.8.2-docfix.patch, 1.1, NONE gtk-sharp-2.9.0-libdir.patch, 1.1, NONE gtk-sharp-2.9.0-monodir.patch, 1.1, NONE gtk-sharp2-2.10.3-assemblydir.patch, 1.1, NONE gtk-sharp2-2.12.0-monodoc.patch, 1.1, NONE gtk-sharp2-vtelibs.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24535/devel
Modified Files:
.cvsignore import.log monodevelop-192-nunit.patch
monodevelop-2.spec sources
Added Files:
monodevelop-210-nunitmakes.patch
monodevelop-210-usececil.patch
Removed Files:
md-192-desktop.patch monodevelop-1.9.1-use-mono-cecil.patch
monodevelop-191-usemonocecil.patch
Log Message:
Bump to 2.2 beta 1
Patch tidy up
Dropped desktop patch
monodevelop-210-nunitmakes.patch:
Makefile-new.in | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
--- NEW FILE monodevelop-210-nunitmakes.patch ---
--- monodevelop-2.1.0/src/addins/NUnit/Makefile.in 2009-09-07 16:36:22.000000000 +0100
+++ monodevelop-2.1.0/src/addins/NUnit/Makefile-new.in 2009-09-09 22:16:00.000000000 +0100
@@ -200,10 +200,10 @@
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(MONO_ADDINS_LIBS) \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
+ -r:$(libdir)/mono/nunit22/nunit.core.dll \
+ -r:$(libdir)/mono/nunit22/nunit.core.interfaces.dll \
+ -r:$(libdir)/mono/nunit22/nunit.framework.dll \
+ -r:$(libdir)/mono/nunit22/nunit.util.dll \
-r:Mono.Cairo \
-r:Mono.Posix \
-r:System \
@@ -269,18 +269,10 @@
templates/NUnitProject.xpt.xml \
templates/NUnitTestClass.xft.xml
-NUNIT_FILES = \
-nunit.core.dll \
-nunit.framework.dll \
-nunit.core.interfaces.dll \
-nunit.util.dll
-
-SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
-BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
assemblydir = $(MD_ADDIN_DIR)/NUnit
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+EXTRA_DIST = $(FILES) $(RES)
build_deps = $(addprefix -r:, $(DEPS))
build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
build_resources = $(addprefix $(srcdir)/, $(RES))
monodevelop-210-usececil.patch:
monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.am | 2 +-
monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.in | 2 +-
monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am | 2 +-
monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in | 2 +-
monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.am | 3 +--
monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.in | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
--- NEW FILE monodevelop-210-usececil.patch ---
--- monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am 2009-08-07 15:39:34.000000000 +0100
+++ monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.am 2009-09-09 18:50:01.000000000 +0100
@@ -40,7 +40,7 @@
DEPS = \
$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
$(top_builddir)/build/bin/Mono.TextEditor.dll \
$(top_builddir)/build/bin/MonoDevelop.Components.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
--- monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile.in 2009-09-07 16:36:20.000000000 +0100
+++ monodevelop-2.1.0/src/addins/MonoDevelop.AssemblyBrowser/Makefile-new.in 2009-09-09 18:50:58.000000000 +0100
@@ -213,7 +213,7 @@
DEPS = \
$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
$(top_builddir)/build/bin/Mono.TextEditor.dll \
$(top_builddir)/build/bin/MonoDevelop.Components.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
--- monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.in 2008-12-17 00:22:07.000000000 +0000
+++ monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.in 2008-12-17 14:57:31.000000000 +0000
@@ -248,7 +248,7 @@
DEPS = \
../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
- ../../../../build/bin/Mono.Cecil.dll
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll
REFS = \
$(GLADE_SHARP_LIBS) \
--- monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile.am 2008-12-17 14:55:48.000000000 +0000
+++ monodevelop-121653/src/addins/MonoDevelop.GtkCore/libsteticui/Makefile-new.am 2008-12-17 14:56:47.000000000 +0000
@@ -75,7 +75,7 @@
DEPS = \
../../../../build/AddIns/MonoDevelop.GtkCore/libstetic.dll \
- ../../../../build/bin/Mono.Cecil.dll
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll
REFS = \
$(GLADE_SHARP_LIBS) \
--- monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.am 2009-08-24 16:22:54.000000000 +0100
+++ monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.am 2009-09-09 22:31:48.000000000 +0100
@@ -3,8 +3,7 @@
CONFIG = MonoDevelop.Projects.dll.config
DEPS = \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
- $(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
$(top_builddir)/build/bin/MonoDevelop.Projects.Formats.MSBuild.exe
--- monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile.in 2009-09-07 16:36:23.000000000 +0100
+++ monodevelop-2.1.0/src/core/MonoDevelop.Projects/Makefile-new.in 2009-09-09 22:33:06.000000000 +0100
@@ -175,8 +175,7 @@
ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.Projects.dll
CONFIG = MonoDevelop.Projects.dll.config
DEPS = \
- $(top_builddir)/build/bin/Mono.Cecil.dll \
- $(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ $(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
$(top_builddir)/build/bin/MonoDevelop.Core.dll \
$(top_builddir)/build/bin/MonoDevelop.Projects.Formats.MSBuild.exe
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 26 Mar 2009 23:24:43 -0000 1.24
+++ .cvsignore 9 Sep 2009 22:24:12 -0000 1.25
@@ -1 +1 @@
-monodevelop-2.0.tar.bz2
+monodevelop-2.1.0.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- import.log 23 Jun 2009 20:16:27 -0000 1.23
+++ import.log 9 Sep 2009 22:24:13 -0000 1.24
@@ -21,3 +21,4 @@ monodevelop-1_9_2-2_beta1_20092202svn127
monodevelop-1_9_3-1_beta2_fc11:HEAD:monodevelop-1.9.3-1.beta2.fc11.src.rpm:1237126492
monodevelop-2_0-1_fc11:HEAD:monodevelop-2.0-1.fc11.src.rpm:1238109849
monodevelop-2_0-3_fc12:HEAD:monodevelop-2.0-3.fc12.src.rpm:1245788128
+monodevelop-2_1_0-1_fc12:HEAD:monodevelop-2.1.0-1.fc12.src.rpm:1252535001
monodevelop-192-nunit.patch:
MonoDevelopNUnit.addin-new.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: monodevelop-192-nunit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-192-nunit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- monodevelop-192-nunit.patch 17 Jan 2009 00:21:23 -0000 1.1
+++ monodevelop-192-nunit.patch 9 Sep 2009 22:24:13 -0000 1.2
@@ -1,51 +1,3 @@
---- monodevelop-123651/src/addins/NUnit/Makefile.in 2009-01-16 22:57:53.000000000 +0000
-+++ monodevelop-123651/src/addins/NUnit/Makefile-new.in 2009-01-16 23:20:46.000000000 +0000
-@@ -200,10 +200,10 @@
- $(GLIB_SHARP_LIBS) \
- $(GTK_SHARP_LIBS) \
- $(MONO_ADDINS_LIBS) \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
-- -r:$(top_srcdir)/src/addins/NUnit/lib/nunit.util.dll \
-+ -r:$(libdir)/mono/nunit22/nunit.core.dll \
-+ -r:$(libdir)/mono/nunit22/nunit.core.interfaces.dll \
-+ -r:$(libdir)/mono/nunit22/nunit.framework.dll \
-+ -r:$(libdir)/mono/nunit22/nunit.util.dll \
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml
-@@ -267,18 +267,10 @@
- templates/NUnitProject.xpt.xml \
- templates/NUnitTestClass.xft.xml
-
--NUNIT_FILES = \
--nunit.core.dll \
--nunit.framework.dll \
--nunit.core.interfaces.dll \
--nunit.util.dll
--
--SRC_NUNIT_FILES = $(addprefix $(srcdir)/lib/, $(NUNIT_FILES))
--BUILD_NUNIT_FILES = $(addprefix $(ADDIN_BUILD)/, $(NUNIT_FILES))
- assemblydir = $(MD_ADDIN_DIR)/NUnit
--assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(SRC_NUNIT_FILES)
--CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
--EXTRA_DIST = $(FILES) $(RES) $(SRC_NUNIT_FILES)
-+assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-+EXTRA_DIST = $(FILES) $(RES)
- build_deps = $(addprefix -r:, $(DEPS))
- build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
- build_resources = $(addprefix $(srcdir)/, $(RES))
-@@ -618,7 +610,7 @@
- uninstall-assemblyDATA
-
-
--all: $(ASSEMBLY) $(ASSEMBLY).mdb $(BUILD_NUNIT_FILES)
-+all: $(ASSEMBLY) $(ASSEMBLY).mdb
-
- $(ADDIN_BUILD)/%: $(srcdir)/lib/%
- mkdir -p $(ADDIN_BUILD)
--- monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin.xml 2009-01-16 22:57:53.000000000 +0000
+++ monodevelop-123651/src/addins/NUnit/MonoDevelopNUnit.addin-new.xml 2009-01-16 23:16:11.000000000 +0000
@@ -10,10 +10,10 @@
Index: monodevelop-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- monodevelop-2.spec 4 Aug 2009 09:09:54 -0000 1.19
+++ monodevelop-2.spec 9 Sep 2009 22:24:13 -0000 1.20
@@ -9,19 +9,18 @@
%define nunitver 2.2.10.0
Name: monodevelop
-Version: 2.0
-Release: 5%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Summary: A full-featured IDE for Mono and Gtk#
Group: Development/Tools
License: GPLv2+
URL: http://monodevelop.com/
Source0: %{name}-%{version}.tar.bz2
-Patch0: monodevelop-1.9.1-use-mono-cecil.patch
+Patch0: monodevelop-210-usececil.patch
Patch1: monodevelop-1.9.2-removed-contrib.patch
Patch2: monodevelop-192-nunit.patch
-Patch3: monodevelop-191-usemonocecil.patch
-Patch4: md-192-desktop.patch
+Patch3: monodevelop-210-nunitmakes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mono-devel >= 2.4 mono-addins-devel >= 0.4 gtk-sharp2-devel
@@ -61,10 +60,10 @@ Development files for %{name}.
%prep
%setup -q
-%patch0 -p1 -b .use-mono-cecil
-%patch1 -p1 -b .use-system-cecil
+%patch0 -p1 -b .monocecil
+%patch1 -p1 -b .remove-contrib
%patch2 -p1 -b .use-system-nunit
-%patch3 -p1 -b .monocecil
+%patch3 -p1 -b .nunit
sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' configure
sed -i -e 's!$PREFIX/lib/!%{_libdir}/!' monodevelop.in
@@ -159,11 +158,10 @@ update-desktop-database &> /dev/null ||
%{_libdir}/pkgconfig/monodevelop*.pc
%changelog
-* Tue Aug 4 2009 Jan Horak <jhorak at redhat.com> - 2.0-5
-- Rebuild against newer gecko
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 09 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -2.1.0-1
+- Bump to 2.2 beta 1
+- Fixed cecil patch
+- Drop desktop patch
* Tue Jun 23 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> -2.0-3
- Fix mdtool libdir issue
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 26 Mar 2009 23:24:43 -0000 1.24
+++ sources 9 Sep 2009 22:24:13 -0000 1.25
@@ -1 +1 @@
-0f527204ffd4785284d9556a75524c3e monodevelop-2.0.tar.bz2
+f4b6b45fa28f18f4253ece7461e6f6f2 monodevelop-2.1.0.tar.bz2
--- md-192-desktop.patch DELETED ---
--- monodevelop-1.9.1-use-mono-cecil.patch DELETED ---
--- monodevelop-191-usemonocecil.patch DELETED ---
- Previous message (by thread): rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.34,1.35
- Next message (by thread): rpms/gtk-sharp2/devel gtksharp-2129-docfix.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.15, 1.16 gtk-sharp2.spec, 1.45, 1.46 sources, 1.15, 1.16 gtk-sharp-2.10.0-libdir.patch, 1.1, NONE gtk-sharp-2.8.2-docfix.patch, 1.1, NONE gtk-sharp-2.9.0-libdir.patch, 1.1, NONE gtk-sharp-2.9.0-monodir.patch, 1.1, NONE gtk-sharp2-2.10.3-assemblydir.patch, 1.1, NONE gtk-sharp2-2.12.0-monodoc.patch, 1.1, NONE gtk-sharp2-vtelibs.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list