rpms/mono/devel mono-264-libdir.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 import.log, 1.59, 1.60 mono.spec, 1.147, 1.148 sources, 1.61, 1.62 mono-26-libdir.patch, 1.1, NONE
Paul F. Johnson
pfj at fedoraproject.org
Tue Apr 27 18:29:12 UTC 2010
Author: pfj
Update of /cvs/pkgs/rpms/mono/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18865/devel
Modified Files:
.cvsignore import.log mono.spec sources
Added Files:
mono-264-libdir.patch
Removed Files:
mono-26-libdir.patch
Log Message:
Update to 2.6.4 release
Fix libdir patch
Minor spec file changes and clean ups
mono-264-libdir.patch:
configure-new.in | 4 ++--
data/cecil.pc-new.in | 2 +-
data/mint.pc-new.in | 2 +-
data/mono-cairo.pc-new.in | 2 +-
data/mono-lineeditor.pc-new.in | 2 +-
data/mono-nunit.pc-new.in | 2 +-
data/mono-options.pc-new.in | 2 +-
data/mono.pc-new.in | 2 +-
data/mono.web.pc-new.in | 2 +-
data/monodoc.pc-new.in | 2 +-
data/system.web.extensions.design_1.0.pc-new.in | 2 +-
data/system.web.extensions_1.0.pc-new.in | 2 +-
data/system.web.mvc.pc-new.in | 2 +-
mcs/build/config-default-new.make | 2 +-
scripts/Makefile-new.am | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
--- NEW FILE mono-264-libdir.patch ---
--- mono-2.6.4/mcs/build/config-default.make 2010-04-22 16:38:03.000000000 +0100
+++ mono-2.6.4/mcs/build/config-default-new.make 2010-04-27 00:29:59.000000000 +0100
@@ -19,7 +19,7 @@
endif
prefix = /usr/local
exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
sysconfdir = $(prefix)/etc
#RUNTIME = mono
RUNTIME = false
--- mono-2.6.4/configure.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/configure-new.in 2010-04-27 00:32:41.000000000 +0100
@@ -2679,7 +2679,7 @@
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+ echo 'mono_libdir=@libdir@' >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -2719,7 +2719,7 @@
if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+ echo 'mono_libdir=@libdir@' >> $srcdir/$olivedir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
--- mono-2.6.4/scripts/Makefile.am 2010-04-22 16:37:43.000000000 +0100
+++ mono-2.6.4/scripts/Makefile-new.am 2010-04-27 00:42:28.000000000 +0100
@@ -176,7 +176,7 @@
endif
else
plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
endif
--- mono-2.6.4/data/cecil.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/cecil.pc-new.in 2010-04-27 00:33:58.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
Name: Mono Internal -- Do not use.
--- mono-2.6.4/data/mint.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mint.pc-new.in 2010-04-27 00:34:27.000000000 +0100
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
includedir=${prefix}/include/mono- at API_VER@
--- mono-2.6.4/data/mono.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono.pc-new.in 2010-04-27 00:34:57.000000000 +0100
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
includedir=${prefix}/include/mono- at API_VER@
sysconfdir=@sysconfdir@
--- mono-2.6.4/data/mono.web.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono.web.pc-new.in 2010-04-27 00:40:27.000000000 +0100
@@ -1,4 +1,4 @@
Name: Mono.Web
Description: Mono ASP.NET extension classes
Version: 2.0.0.0
-Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
+Libs: -r:@libdir@/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
--- mono-2.6.4/data/mono-cairo.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono-cairo.pc-new.in 2010-04-27 00:36:06.000000000 +0100
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/@reloc_libdir@
+libdir=@libdir@
includedir=${prefix}/include
Name: Mono.Cairo
--- mono-2.6.4/data/monodoc.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/monodoc.pc-new.in 2010-04-27 00:36:45.000000000 +0100
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
sourcesdir=${libdir}/monodoc/sources
Name: Monodoc
--- mono-2.6.4/data/mono-lineeditor.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono-lineeditor.pc-new.in 2010-04-27 00:37:17.000000000 +0100
@@ -1,5 +1,5 @@
prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
Sources=${assemblies_dir}/getline.cs
Name: Mono.Terminal.LineEditor
--- mono-2.6.4/data/mono-nunit.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono-nunit.pc-new.in 2010-04-27 00:37:48.000000000 +0100
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
Name: Mono NUnit
--- mono-2.6.4/data/mono-options.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/mono-options.pc-new.in 2010-04-27 00:38:21.000000000 +0100
@@ -1,5 +1,5 @@
prefix=${pcfiledir}/../..
-assemblies_dir=${prefix}/lib/mono-source-libs
+assemblies_dir=@libdir@/mono-source-libs
Sources=${assemblies_dir}/Options.cs
Name: Mono.Options
--- mono-2.6.4/data/system.web.extensions.design_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/system.web.extensions.design_1.0.pc-new.in 2010-04-27 00:38:43.000000000 +0100
@@ -1,4 +1,4 @@
Name: System.Web.Extensions.Design
Description: System.Web.Extensions.Design ASP.NET 2.0 add-on
Version: 1.0.61025.0
-Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
+Libs: -r:@libdir@/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
--- mono-2.6.4/data/system.web.extensions_1.0.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/system.web.extensions_1.0.pc-new.in 2010-04-27 00:39:00.000000000 +0100
@@ -1,4 +1,4 @@
Name: System.Web.Extensions
Description: System.Web.Extensions ASP.NET 2.0 add-on
Version: 1.0.61025.0
-Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
+Libs: -r:@libdir@/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
--- mono-2.6.4/data/system.web.mvc.pc.in 2010-04-22 16:37:47.000000000 +0100
+++ mono-2.6.4/data/system.web.mvc.pc-new.in 2010-04-27 00:39:16.000000000 +0100
@@ -1,4 +1,4 @@
Name: System.Web.Mvc
Description: System.Web.Mvc - ASP.NET MVC
Version: 1.0.0.0
-Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
+Libs: -r:@libdir@/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore 19 Mar 2010 22:18:56 -0000 1.47
+++ .cvsignore 27 Apr 2010 18:29:12 -0000 1.48
@@ -1 +1 @@
-mono-2.6.3.tar.bz2
+mono-2.6.4.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- import.log 19 Mar 2010 22:18:56 -0000 1.59
+++ import.log 27 Apr 2010 18:29:12 -0000 1.60
@@ -2,3 +2,4 @@ mono-2_6-1_fc12:HEAD:mono-2.6-1.fc12.src
mono-2_6-4_fc13:HEAD:mono-2.6-4.fc13.src.rpm:1261527294
mono-2_6_1-1_fc13:HEAD:mono-2.6.1-1.fc13.src.rpm:1261528029
mono-2_6_3-1_fc14:HEAD:mono-2.6.3-1.fc14.src.rpm:1269037048
+mono-2_6_4-1_fc14:HEAD:mono-2.6.4-1.fc14.src.rpm:1272392899
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- mono.spec 19 Mar 2010 22:18:57 -0000 1.147
+++ mono.spec 27 Apr 2010 18:29:12 -0000 1.148
@@ -1,7 +1,7 @@
#%define svnver 138447
Name: mono
-Version: 2.6.3
+Version: 2.6.4
Release: 1%{?dist}
Summary: A .NET runtime environment
@@ -23,7 +23,7 @@ BuildRequires: bison
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
-BuildRequires: libgdiplus-devel >= 2.6
+BuildRequires: libgdiplus-devel >= 2.6.4
BuildRequires: zlib-devel
%ifarch ia64
BuildRequires: libunwind
@@ -49,7 +49,10 @@ Patch3: mono-2.2-uselibdir.patch
Patch4: mono-2.0-monoservice.patch
Patch5: mono-2.6-metadata-makefile.patch
Patch6: mono-242-libgdiplusconfig.patch
-Patch7: mono-26-libdir.patch
+Patch7: mono-264-libdir.patch
+
+Obsoletes: mono-mono-4-preview < 2.6.4
+Provides: mono-4-preview = %{version}-%{release}
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -316,9 +319,6 @@ Preview for the new C# 4.0 code
sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
%patch7 -p1 -b .libdir-22
sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/mono.web.pc.in
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in
-sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in
sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in}
autoreconf -f -i -s
@@ -771,6 +771,15 @@ install -p -m0644 %{SOURCE2} %{buildroot
%gac_dll System.Dynamic
%changelog
+* Tue Apr 27 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.4-1
+- Bump to 2.6.4 release
+- BR now requires libgdiplus-2.6.4
+- Updated libdir patch
+- Spec cleanup
+
+* Fri Mar 19 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.3-2
+- Forgt to add the obsoletes and provides for the new name mono-4-preview
+
* Fri Mar 19 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.6.3-1
- Bump to bugfix release
- Added RabbitMQ to extras
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources 19 Mar 2010 22:18:57 -0000 1.61
+++ sources 27 Apr 2010 18:29:12 -0000 1.62
@@ -1 +1 @@
-b1dc21bac2c7c75814a9f32246eadadd mono-2.6.3.tar.bz2
+342a7ca3bea3cbec0c8ac48b9322fcb4 mono-2.6.4.tar.bz2
--- mono-26-libdir.patch DELETED ---
More information about the scm-commits
mailing list