rpms/monodevelop/devel monodevelop-191-usemonocecil.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 import.log, 1.5, 1.6 monodevelop-1.9-use-system-cecil.patch, 1.3, 1.4 monodevelop.spec, 1.39, 1.40 sources, 1.10, 1.11 monodevelop-1.9-headbuild.patch, 1.1, NONE
Paul F. Johnson
pfj at fedoraproject.org
Tue Nov 25 16:00:03 UTC 2008
- Previous message (by thread): rpms/libfprint/devel 0002-Fix-fp_get_pollfds.patch, NONE, 1.1 libfprint.spec, 1.10, 1.11
- Next message (by thread): rpms/libwnck/F-10 .cvsignore, 1.68, 1.69 libwnck.spec, 1.103, 1.104 sources, 1.68, 1.69
- 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-serv10061/devel
Modified Files:
.cvsignore import.log monodevelop-1.9-use-system-cecil.patch
monodevelop.spec sources
Added Files:
monodevelop-191-usemonocecil.patch
Removed Files:
monodevelop-1.9-headbuild.patch
Log Message:
Update to 2.0 alpha 2 (version 1.9.1)
monodevelop-191-usemonocecil.patch:
--- NEW FILE monodevelop-191-usemonocecil.patch ---
--- monodevelop-1.9.1/src/core/MonoDevelop.Projects/Makefile.am 2008-11-23 17:50:57.000000000 +0000
+++ monodevelop-1.9.1/src/core/MonoDevelop.Projects/Makefile-new.am 2008-11-23 18:01:46.000000000 +0000
@@ -5,9 +5,9 @@
REFS = \
$(MONO_ADDINS_LIBS) \
- $(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ $(MONODOC_LIBS)
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Data \
-r:Mono.Data.Sqlite \
--- monodevelop-1.9.1/src/core/MonoDevelop.Projects/Makefile.in 2008-11-23 17:50:57.000000000 +0000
+++ monodevelop-1.9.1/src/core/MonoDevelop.Projects/Makefile-new.in 2008-11-23 17:56:29.000000000 +0000
@@ -181,8 +181,8 @@
REFS = \
$(MONO_ADDINS_LIBS) \
$(MONODOC_LIBS) \
- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:Mono.Data \
-r:Mono.Data.Sqlite \
--- monodevelop-1.9.1/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-11-23 17:50:57.000000000 +0000
+++ monodevelop-1.9.1/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile-new.am 2008-11-23 18:00:27.000000000 +0000
@@ -87,7 +87,7 @@
-pkg:gnome-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-r:$(top_builddir)/bin/libstetic.dll \
- -r:$(CECIL_DLL) \
+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
@@ -112,13 +112,6 @@
mkdir -p $(ASSEMBLY_DIR)
cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
-CECIL = Mono.Cecil.dll
-CECIL_DLL = $(ASSEMBLY_DIR)/$(CECIL)
-
-$(CECIL_DLL): $(CECIL_PATH)
- mkdir -p $(ASSEMBLY_DIR)
- cp $(CECIL_PATH) $(ASSEMBLY_DIR)/.
-
CLEANFILES = $(ASSEMBLY_FILES) sources.rsp
EXTRA_DIST = \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 8 Jul 2008 10:35:29 -0000 1.10
+++ .cvsignore 25 Nov 2008 15:59:32 -0000 1.11
@@ -1 +1 @@
-monodevelop-1.9.tar.bz2
+monodevelop-1.9.1.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log 19 Oct 2008 13:42:42 -0000 1.5
+++ import.log 25 Nov 2008 15:59:32 -0000 1.6
@@ -3,3 +3,4 @@
monodevelop-1_9-3_fc10:HEAD:monodevelop-1.9-3.fc10.src.rpm:1218291689
monodevelop-1_9-6_fc10:HEAD:monodevelop-1.9-6.fc10.src.rpm:1221075263
monodevelop-1_9-7_fc10:HEAD:monodevelop-1.9-7.fc10.src.rpm:1224423709
+monodevelop-1_9_1-1_pre1_fc10:HEAD:monodevelop-1.9.1-1.pre1.fc10.src.rpm:1227628723
monodevelop-1.9-use-system-cecil.patch:
Index: monodevelop-1.9-use-system-cecil.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop-1.9-use-system-cecil.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monodevelop-1.9-use-system-cecil.patch 24 Aug 2008 21:29:14 -0000 1.3
+++ monodevelop-1.9-use-system-cecil.patch 25 Nov 2008 15:59:32 -0000 1.4
@@ -9,32 +9,7 @@
bin_SCRIPTS = monodevelop mdtool
desktopdir = $(datadir)/applications
desktop_DATA = monodevelop.desktop
---- monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am.use-system-cecil 2008-06-30 13:34:45.000000000 -0400
-+++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.am 2008-08-23 22:39:47.000000000 -0400
-@@ -6,8 +6,8 @@
- REFS = \
- $(MONO_ADDINS_LIBS) \
- $(MONODOC_LIBS) \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
-+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:Mono.Posix \
- -r:System \
---- monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in.use-system-cecil 2008-06-30 19:33:59.000000000 -0400
-+++ monodevelop-1.9/src/core/MonoDevelop.Projects/Makefile.in 2008-08-23 22:39:47.000000000 -0400
-@@ -181,8 +181,8 @@
- REFS = \
- $(MONO_ADDINS_LIBS) \
- $(MONODOC_LIBS) \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.dll \
-- -r:$(top_builddir)/build/bin/Mono.Cecil.Mdb.dll \
-+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
-+ -r:$(libdir)/mono/gac/Mono.Cecil.Mdb/LONGCECILMDBSTRING/Mono.Cecil.Mdb.dll \
- -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
- -r:Mono.Posix \
- -r:System \
+
--- monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am.use-system-cecil 2008-06-30 13:33:45.000000000 -0400
+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.am 2008-08-23 22:39:47.000000000 -0400
@@ -16,7 +16,7 @@
@@ -68,53 +43,7 @@
-r:Mono.Posix \
-r:System.Runtime.Remoting \
-r:System.Xml
---- monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am.use-system-cecil 2008-06-30 13:33:38.000000000 -0400
-+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/lib/stetic/libsteticui/Makefile.am 2008-08-23 22:39:47.000000000 -0400
-@@ -5,7 +5,6 @@
- ASSEMBLY_FILES = \
- $(ASSEMBLY) \
- $(ASSEMBLY_DIR)/libsteticui.dll.mdb \
-- $(CECIL_DLL) \
- $(DATA_FILE_BUILD)
-
- pkglib_DATA = $(ASSEMBLY_FILES)
-@@ -86,7 +85,7 @@
- -pkg:gnome-sharp-2.0 \
- -pkg:gtk-sharp-2.0 \
- -r:$(top_builddir)/bin/libstetic.dll \
-- -r:$(top_srcdir)/libsteticui/lib/Mono.Cecil.dll \
-+ -r:$(libdir)/mono/gac/Mono.Cecil/LONGCECILSTRING/Mono.Cecil.dll \
- -r:Mono.Posix \
- -r:System.Runtime.Remoting \
- -r:System.Xml
-@@ -94,7 +93,7 @@
- libsteticui_dll_datafiles = libsteticui.dll.config
-
-
--all: $(ASSEMBLY) $(DATA_FILE_BUILD) $(CECIL_DLL)
-+all: $(ASSEMBLY) $(DATA_FILE_BUILD)
-
- RESOURCE_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_resources))
- DATA_FILES = $(addprefix $(srcdir)/, $(libsteticui_dll_datafiles))
-@@ -111,17 +110,9 @@
- mkdir -p $(ASSEMBLY_DIR)
- cp $(srcdir)/$(subst $(ASSEMBLY_DIR),$(srcdir),$@) $(ASSEMBLY_DIR)/.
-
--CECIL = Mono.Cecil.dll
--CECIL_DLL = $(ASSEMBLY_DIR)/$(CECIL)
--
--$(CECIL_DLL): $(srcdir)/lib/$(CECIL)
-- mkdir -p $(ASSEMBLY_DIR)
-- cp $(srcdir)/lib/$(CECIL) $(ASSEMBLY_DIR)/.
--
- CLEANFILES = $(ASSEMBLY_FILES) sources.rsp
-
- EXTRA_DIST = \
- $(libsteticui_dll_sources) \
- $(RESOURCE_FILES) \
-- $(DATA_FILES) \
-- $(srcdir)/lib/$(CECIL)
-+ $(DATA_FILES)
+
--- monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in.use-system-cecil 2008-06-30 19:33:58.000000000 -0400
+++ monodevelop-1.9/src/addins/MonoDevelop.GtkCore/Makefile.in 2008-08-23 22:39:47.000000000 -0400
@@ -199,7 +199,7 @@
Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- monodevelop.spec 19 Oct 2008 13:42:42 -0000 1.39
+++ monodevelop.spec 25 Nov 2008 15:59:32 -0000 1.40
@@ -10,8 +10,8 @@
Name: monodevelop
-Version: 1.9
-Release: 7%{?dist}
+Version: 1.9.1
+Release: 1.pre1%{?dist}
Summary: A full-featured IDE for Mono and Gtk#
Group: Development/Tools
@@ -21,23 +21,22 @@
Patch0: monodevelop-1.9-libdir.patch
Patch1: monodevelop-1.9-use-system-cecil.patch
Patch2: monodevelop-1.9-use-system-nunit.patch
-Patch3: monodevelop-1.9-headbuild.patch
+Patch3: monodevelop-191-usemonocecil.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel mono-addins-devel gtk-sharp2-devel monodoc-devel
+BuildRequires: mono-devel mono-addins-devel gtk-sharp2-devel
BuildRequires: gnome-sharp-devel gnome-desktop-sharp-devel mono-nunit-devel
# for the NUnit add-in
BuildRequires: mono-nunit22 xulrunner-devel-unstable
-BuildRequires: autoconf desktop-file-utils intltool
+BuildRequires: autoconf desktop-file-utils intltool monodoc-devel
# MonoDevelop is not xulrunner-ready yet
#Requires: gecko-sharp2
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, gnome-sharp gtk-sharp2 gnome-desktop-sharp
-Requires: subversion
+Requires: gnome-sharp gtk-sharp2 gnome-desktop-sharp
+Requires: subversion monodoc
Requires: hicolor-icon-theme shared-mime-info
# ppc* not supported: needs mono-nunit which needs nant
@@ -64,8 +63,8 @@
%patch0 -p1 -b .libdir
%patch1 -p1 -b .use-system-cecil
%patch2 -p1 -b .use-system-nunit
-%patch3 -p1 -b .head
-autoreconf
+%patch3 -p1 -b .monocecil
+#autoreconf
# Here is where we replace the LONGCECILSTRING and LONGCECILMDBSTRING
# placeholders with the actual values for the Mono.Cecil and Mono.Cecil.Mdb
@@ -91,8 +90,7 @@
%build
%configure --disable-update-mimedb \
- --disable-update-desktopdb \
- --enable-gtksourceview2 --enable-tests
+ --disable-update-desktopdb
# Not parallel-buildable
#make %{?_smp_mflags}
@@ -145,6 +143,10 @@
%changelog
+* Sun Nov 23 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9.1-1.pre1
+- Update to 1.9.1 preview 1
+- Removed R mono-basic and vala
+
* Sat Oct 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-7
- Fix dependancies of R (BZ 467544)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 8 Jul 2008 10:35:29 -0000 1.10
+++ sources 25 Nov 2008 15:59:32 -0000 1.11
@@ -1 +1 @@
-9e2b52ad41101f1e56dee8200b181dd5 monodevelop-1.9.tar.bz2
+de6d1b2d135836048e0091ae60edb591 monodevelop-1.9.1.tar.bz2
--- monodevelop-1.9-headbuild.patch DELETED ---
- Previous message (by thread): rpms/libfprint/devel 0002-Fix-fp_get_pollfds.patch, NONE, 1.1 libfprint.spec, 1.10, 1.11
- Next message (by thread): rpms/libwnck/F-10 .cvsignore, 1.68, 1.69 libwnck.spec, 1.103, 1.104 sources, 1.68, 1.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list