rpms/mono/F-13 mono-264-libdir.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 mono.spec, 1.146, 1.147 sources, 1.60, 1.61 mono-26-libdir.patch, 1.1, NONE
chkr
chkr at fedoraproject.org
Mon Jun 21 17:15:47 UTC 2010
- Previous message: rpms/gparted/devel .cvsignore, 1.27, 1.28 gparted.spec, 1.60, 1.61 sources, 1.27, 1.28
- Next message: rpms/libmodplug/EL-6 .cvsignore, 1.6, 1.7 libmodplug.spec, 1.18, 1.19 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: chkr
Update of /cvs/pkgs/rpms/mono/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14257
Modified Files:
.cvsignore mono.spec sources
Added Files:
mono-264-libdir.patch
Removed Files:
mono-26-libdir.patch
Log Message:
* Mon Jun 21 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.4-1
- Fix for x86_64 mono-cairo.pc
- Fix libs for monodoc on x86_64
- Bump to 2.6.4 release
- Updated libdir patch
- Spec cleanup
- Added RabbitMQ to extras
- Correct the name for mono-4-preview
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/F-13/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore 23 Dec 2009 00:28:22 -0000 1.46
+++ .cvsignore 21 Jun 2010 17:15:47 -0000 1.47
@@ -1 +1 @@
-mono-2.6.1.tar.bz2
+mono-2.6.4.tar.bz2
Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-13/mono.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- mono.spec 24 Feb 2010 22:43:01 -0000 1.146
+++ mono.spec 21 Jun 2010 17:15:47 -0000 1.147
@@ -1,8 +1,8 @@
#%define svnver 138447
Name: mono
-Version: 2.6.1
-Release: 2%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@@ -49,7 +49,8 @@ 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
+
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -268,12 +269,13 @@ Requires: mono-core = %{version}-%{relea
%description -n monodoc-devel
Development file for monodoc
-%package mono-4-preview
+%package -n mono-4-preview
Summary: Provides preview code for C# 4
Group: Development/Languages
Requires: mono-core = %{version}-%{release}
+Obsoletes: mono-mono-4-preview < 2.6.4
-%description mono-4-preview
+%description -n mono-4-preview
Preview for the new C# 4.0 code
%define monodir %{_libdir}/mono
@@ -316,10 +318,9 @@ 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}
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!' data/monodoc.pc.in
+sed -i -e 's!${prefix}/lib/!%{_libdir}/!' data/mono-cairo.pc.in
autoreconf -f -i -s
@@ -624,6 +625,8 @@ install -p -m0644 %{SOURCE2} %{buildroot
%gac_dll Mono.Messaging.RabbitMQ
%gac_dll Mono.Messaging
%gac_dll RabbitMQ.Client
+%{_libdir}/mono/1.0/RabbitMQ.Client.Apigen*
+%{_libdir}/mono/2.0/RabbitMQ.Client.Apigen*
%files wcf
%defattr(-, root, root, -)
@@ -753,7 +756,7 @@ install -p -m0644 %{SOURCE2} %{buildroot
%defattr (-, root, root)
%{_libdir}/pkgconfig/monodoc.pc
-%files mono-4-preview
+%files -n mono-4-preview
%defattr (-, root, root)
%config (noreplace) %{_sysconfdir}/mono/4.0/*.config
%config (noreplace) %{_sysconfdir}/mono/4.0/settings.map
@@ -762,12 +765,22 @@ install -p -m0644 %{SOURCE2} %{buildroot
%{_bindir}/dmcs
%{monodir}/4.0/*.exe
%{monodir}/4.0/*.exe.*
-%{monodir}/4.0/*.dll
+%{monodir}/4.0/Mono.Security.Win32.dll
+%{monodir}/4.0/System.Xml.Linq.dll
%gac_dll Microsoft.CSharp
%{_libdir}/mono/gac/System.Data.Services/4.0*
%gac_dll System.Dynamic
%changelog
+* Mon Jun 21 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.4-1
+- Fix for x86_64 mono-cairo.pc
+- Fix libs for monodoc on x86_64
+- Bump to 2.6.4 release
+- Updated libdir patch
+- Spec cleanup
+- Added RabbitMQ to extras
+- Correct the name for mono-4-preview
+
* Mon Feb 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.6.1-2
- Fix upgrade path F12 -> F13 by obsoleting and providing mono-moonlight
- Minor spec file cleanup
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-13/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- sources 23 Dec 2009 00:28:22 -0000 1.60
+++ sources 21 Jun 2010 17:15:47 -0000 1.61
@@ -1 +1 @@
-4cd2157c9eabbe9f49232d5ee3a2a57e mono-2.6.1.tar.bz2
+342a7ca3bea3cbec0c8ac48b9322fcb4 mono-2.6.4.tar.bz2
--- mono-26-libdir.patch DELETED ---
- Previous message: rpms/gparted/devel .cvsignore, 1.27, 1.28 gparted.spec, 1.60, 1.61 sources, 1.27, 1.28
- Next message: rpms/libmodplug/EL-6 .cvsignore, 1.6, 1.7 libmodplug.spec, 1.18, 1.19 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list