rpms/mono/devel import.log, 1.63, 1.64 mono.spec, 1.153, 1.154 sources, 1.63, 1.64 mono-267-c4.patch, 1.1, NONE

Paul F. Johnson pfj at fedoraproject.org
Fri Jul 23 21:44:20 UTC 2010


Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13380/devel

Modified Files:
	import.log mono.spec sources 
Removed Files:
	mono-267-c4.patch 
Log Message:

Full release
Remove 2.6.7.c4 patch
Move Build.Utilities.v4 back to core as that's where it should be! 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- import.log	14 Jul 2010 21:45:29 -0000	1.63
+++ import.log	23 Jul 2010 21:44:20 -0000	1.64
@@ -6,3 +6,4 @@ mono-2_6_4-1_fc14:HEAD:mono-2.6.4-1.fc14
 mono-2_6_4-2_fc14:HEAD:mono-2.6.4-2.fc14.src.rpm:1275299763
 mono-2_6_4-3_fc14:HEAD:mono-2.6.4-3.fc14.src.rpm:1275856661
 mono-2_6_7-1_fc14:HEAD:mono-2.6.7-1.fc14.src.rpm:1279143830
+mono-2_6_7-3_fc14:HEAD:mono-2.6.7-3.fc14.src.rpm:1279921391


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- mono.spec	15 Jul 2010 08:42:48 -0000	1.153
+++ mono.spec	23 Jul 2010 21:44:20 -0000	1.154
@@ -8,7 +8,7 @@
 
 Name:           mono
 Version:        2.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -56,7 +56,6 @@ Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.6-metadata-makefile.patch
 Patch6: mono-242-libgdiplusconfig.patch
 Patch7: mono-264-libdir.patch
-Patch8: mono-267-c4.patch
 
 %if %{with_mono4}
 Obsoletes: mono-mono-4-preview < 2.6.4
@@ -329,7 +328,6 @@ Preview for the new C# 4.0 code
 %patch6 -p1 -b .libgdiplus
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
-%patch8 -p1 -b .c4
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
 sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
 sed -i -e 's!${prefix}/lib/!%{_libdir}/!' data/monodoc.pc.in
@@ -497,6 +495,10 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
 %{_libdir}/mono-source-libs/
 %{monodir}/compat-2.0/System.Web.Mvc.dll
+%if %{with_mono4}
+%{_libdir}/mono/gac/Microsoft.Build.Tasks.v4.0/4.0*
+%{_libdir}/mono/gac/Microsoft.Build.Utilities.v4.0/4.0*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -799,11 +801,14 @@ install -p -m0644 %{SOURCE2} %{buildroot
 %{_libdir}/mono/gac/System.Data.Services/4.0*
 %gac_dll System.Dynamic 
 %{monodir}/4.0/xbuild*
-%{_libdir}/mono/gac/Microsoft.Build.Tasks.v4.0/4.0*
-%{_libdir}/mono/gac/Microsoft.Build.Utilities.v4.0/4.0*
 %endif
 
 %changelog
+* Wed Jul 21 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.7-3
+- Bump to full release
+- Remove patch 8 (preview-4 patch)
+- Put Build.Utilities.v4 back into the core part as it's needed in core
+
 * Thu Jul 15 2010 Dan Horák <dan[at]danny.cz> - 2.6.7-2
 - conditionalize the C# 4.0 support, don't build it on s390(x)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	14 Jul 2010 21:45:29 -0000	1.63
+++ sources	23 Jul 2010 21:44:20 -0000	1.64
@@ -1 +1 @@
-5851a2e6a6e6ae68fbc2a1c9ff1ead93  mono-2.6.7.tar.bz2
+cc8b7bf061bd11fbd0fcc1c95eb79d34  mono-2.6.7.tar.bz2


--- mono-267-c4.patch DELETED ---



More information about the scm-commits mailing list