Hello community,
here is the log from the commit of package moonlight for openSUSE:Factory
checked in at Tue Mar 9 20:06:27 CET 2010.
--------
--- moonlight/moonlight.changes 2010-01-26 23:14:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/moonlight/moonlight.changes 2010-03-09 01:36:34.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Mar 9 00:33:49 UTC 2010 - ajorgensen@novell.com
+
+- Update to Moonlight 2.2
+- Added a patch to libgc to get around gcc changes
+
+-------------------------------------------------------------------
+Fri Feb 26 18:05:15 UTC 2010 - ajorgensen@novell.com
+
+- Update to Moonlight 2.1
+- Added the -plugin package
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mono-2.6.tar.bz2
moonlight-2.0.tar.bz2
xen-aot.patch
New:
----
bad-register.patch
mono-2.6.1.tar.bz2
moonlight-2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ moonlight.spec ++++++
--- /var/tmp/diff_new_pack.2KxHFh/_old 2010-03-09 20:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.2KxHFh/_new 2010-03-09 20:06:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package moonlight (Version 2.0)
+# spec file for package moonlight (Version 2.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,20 +16,36 @@
#
+# Decide if we use FFmpeg
%define with_ffmpeg no
%if 0%{?packman_bs}
%define with_ffmpeg yes
%endif
+
# Decide if we use the system cairo
%define with_cairo embedded
%define required_cairo 1.8.4
%if 0%{?suse_version} >= 1120
%define with_cairo system
%endif
+
# The version we must have on the system to build the plugin
%define required_mono 2.6
+
+# If the system mono is older we must disable the desktop parts
+# because there will be problems with libmono.so
+%define with_desktop yes
+%define desktop_support --enable-desktop-support --enable-sdk
+# Comment this section out if you know you have mono >= required_mono
+#if 0%{?suse_version} < 1120
+#define with_desktop no
+#define desktop_support --disable-desktop-support --disable-sdk
+#endif
+
# The version included with the sources (for the plugin assemblies)
-%define included_mono 2.6
+%define included_mono 2.6.1
+%define included_basic 2.6
+
# I have not parameterized this spec file to facilitate building only
# the desktop assemblies (or the plugin) but that should be possible
@@ -39,13 +55,13 @@
Group: Productivity/Multimedia/Other
Summary: Novell Moonlight
Url: http://go-mono.com/moonlight/
-Version: 2.0
+Version: 2.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Source1: mono-%{included_mono}.tar.bz2
-Source2: mono-basic-%{included_mono}.tar.bz2
-Patch0: xen-aot.patch
+Source2: mono-basic-%{included_basic}.tar.bz2
+Patch0: bad-register.patch
# Required to build the included mono
BuildRequires: bison
# Always required
@@ -59,20 +75,26 @@
BuildRequires: alsa-devel
BuildRequires: libpulse-devel
# Required to build the desktop assemblies
+%if %{with_desktop} == yes
BuildRequires: monodoc-core
BuildRequires: gtk-sharp2
BuildRequires: rsvg2-sharp
BuildRequires: wnck-sharp
+BuildRequires: mono-devel >= %required_mono
+%endif
# Required to build the plugin
-BuildRequires: mono-devel >= 2.6
BuildRequires: zip
+# Choose the right version of xul
+%define xul_version 190
%if 0%{?suse_version} >= 1120
-BuildRequires: mozilla-xulrunner191-devel
-%else
-# If you wanted to build both ff2 and ff3 bridges
-# you would BuildRequire both versions of xul
-BuildRequires: mozilla-xulrunner190-devel
+%define xul_version 191
%endif
+%if 0%{?suse_version} >= 1130
+%define xul_version 192
+%endif
+BuildRequires: mozilla-xulrunner%{xul_version}-devel
+# For the plugin libmono
+BuildRequires: chrpath
%if %{with_ffmpeg} == yes
BuildRequires: libffmpeg-devel
%endif
@@ -86,7 +108,9 @@
License: LGPLv2.0
Summary: Novell Moonlight
Group: Productivity/Multimedia/Other
-Requires: mono-core >= 2.6
+%if %{with_desktop} == yes
+Requires: mono-core >= %required_mono
+%endif
%description -n libmoon0
Moonlight is an open source implementation of Microsoft Silverlight for
@@ -96,6 +120,8 @@
%defattr(-, root, root)
%doc AUTHORS COPYING README TODO NEWS
%{_libdir}/libmoon.so.*
+%dir %{_libdir}/moonlight
+%{_libdir}/moonlight/libmono.so.0
%post -n libmoon0 -p /sbin/ldconfig
@@ -105,7 +131,9 @@
License: LGPLv2.0
Summary: Development files for libmoon
Group: Development/Languages/C and C++
-Requires: mono-devel >= 2.6
+%if %{with_desktop} == yes
+Requires: mono-devel >= %required_mono
+%endif
%description -n libmoon-devel
Development files for libmoon.
@@ -116,40 +144,43 @@
%files -n libmoon-devel
%defattr(-, root, root)
%{_libdir}/libmoon.so
-#%package plugin
-#License: LGPL v2.0 only ; MIT License (or similar) ; Ms-Pl
-#Summary: Novell Moonlight Browser Plugin
-#Group: Productivity/Multimedia/Other
-#Requires: libmoon0 == %{version}
-#
-#%description plugin
-#Novell Moonlight Browser Plugin.
-#
-#Moonlight is an open source implementation of Microsoft Silverlight for
-#Unix systems.
-#
-#%files plugin
-#%defattr(-, root, root)
-#%dir %{_libdir}/moonlight/plugin
-#%{_libdir}/moonlight/plugin/libmono.so.0
-#%{_libdir}/moonlight/plugin/libmoonloader.so
-#%{_libdir}/moonlight/plugin/libmoonplugin-ff3bridge.so
-#%{_libdir}/moonlight/plugin/libmoonplugin.so
-#%{_libdir}/moonlight/plugin/Microsoft.VisualBasic.dll*
-#%{_libdir}/moonlight/plugin/System.Core.dll*
-#%{_libdir}/moonlight/plugin/System.Net.dll*
-#%{_libdir}/moonlight/plugin/System.Runtime.Serialization.dll*
-#%{_libdir}/moonlight/plugin/System.ServiceModel.Web.dll*
-#%{_libdir}/moonlight/plugin/System.ServiceModel.dll*
-#%{_libdir}/moonlight/plugin/System.Windows.Browser.dll*
-#%{_libdir}/moonlight/plugin/System.Windows.dll*
-#%{_libdir}/moonlight/plugin/System.Xml.dll*
-#%{_libdir}/moonlight/plugin/System.dll*
-#%{_libdir}/moonlight/plugin/mscorlib.dll*
-## Is there somewhere we could put this that would be universal?
-#%if 0%{?suse_version}
-#%{_libdir}/browser-plugins/libmoonloader.so
-#%endif
+
+%package plugin
+License: LGPLv2.0 ; MIT License (or similar) ; Ms-Pl
+Summary: Novell Moonlight Browser Plugin
+Group: Productivity/Multimedia/Other
+Requires: libmoon0 == %{version}
+
+%description plugin
+Novell Moonlight Browser Plugin.
+
+Moonlight is an open source implementation of Microsoft Silverlight for
+Unix systems.
+
+%files plugin
+%defattr(-, root, root)
+%dir %{_libdir}/moonlight/plugin
+%{_libdir}/moonlight/plugin/libmoonloader.so
+%{_libdir}/moonlight/plugin/libmoonplugin-*bridge.so
+%{_libdir}/moonlight/plugin/libmoonplugin.so
+%{_libdir}/moonlight/plugin/Microsoft.VisualBasic.dll*
+%{_libdir}/moonlight/plugin/System.Core.dll*
+%{_libdir}/moonlight/plugin/System.Net.dll*
+%{_libdir}/moonlight/plugin/System.Runtime.Serialization.dll*
+%{_libdir}/moonlight/plugin/System.ServiceModel.Web.dll*
+%{_libdir}/moonlight/plugin/System.ServiceModel.dll*
+%{_libdir}/moonlight/plugin/System.Windows.Browser.dll*
+%{_libdir}/moonlight/plugin/System.Windows.dll*
+%{_libdir}/moonlight/plugin/System.Xml.dll*
+%{_libdir}/moonlight/plugin/System.dll*
+%{_libdir}/moonlight/plugin/mscorlib.dll*
+# Is there somewhere we could put this that would be universal?
+%if 0%{?suse_version}
+%{_libdir}/browser-plugins/libmoonloader.so
+%endif
+
+# Conditional packages
+%if %{with_desktop} == yes
%package web-devel
License: MIT License (or similar) ; Ms-Pl
@@ -185,6 +216,7 @@
%{_prefix}/lib/moonlight/2.0/System.dll*
%{_prefix}/lib/moonlight/2.0/mscorlib.dll*
%{_prefix}/lib/moonlight/2.0/respack.exe*
+%{_prefix}/lib/moonlight/2.0/smcs
%{_prefix}/lib/moonlight/2.0/smcs.exe*
%{_prefix}/lib/moonlight/2.0/buildversion
%{_datadir}/pkgconfig/moonlight-web-2.0.pc
@@ -241,13 +273,17 @@
%{_prefix}/lib/monodoc/sources/moonlight-gtk.tree
%{_prefix}/lib/monodoc/sources/moonlight-gtk.zip
%{_datadir}/pkgconfig/moonlight-gtk-2.0.pc
+# End conditional packages
+%endif
%package tools
License: MIT License (or similar)
Summary: Various tools for Novell Moonlight
Group: Development/Languages/Other
Requires: libmoon0 == %{version}
+%if %{with_desktop} == yes
Requires: %{name}-desktop == %{version}
+%endif
%description tools
Various tools for Novell Moonlight.
@@ -257,13 +293,16 @@
%files tools
%defattr(-, root, root)
+%if %{with_desktop} == yes
%{_bindir}/mopen
%{_bindir}/munxap
+%endif
%{_bindir}/mxap
%{_bindir}/respack
%{_bindir}/sockpol
%{_bindir}/unrespack
%{_bindir}/xaml2html
+%if %{with_desktop} == yes
%{_bindir}/xamlg
%{_mandir}/man1/mopen.1%ext_man
%{_mandir}/man1/mxap.1%ext_man
@@ -271,9 +310,9 @@
%{_mandir}/man1/sockpol.1%ext_man
%{_mandir}/man1/svg2xaml.1%ext_man
%{_mandir}/man1/xamlg.1%ext_man
-%dir %{_libdir}/moonlight
%{_libdir}/moonlight/mopen.exe*
%{_libdir}/moonlight/munxap.exe*
+%endif
%{_libdir}/moonlight/mxap.exe*
%{_libdir}/moonlight/respack.exe*
%{_libdir}/moonlight/sockpol.exe*
@@ -296,7 +335,7 @@
./configure --prefix=%{_builddir}/install \
--with-mcs-docs=no \
--with-ikvm-native=no
-%{__make} #%{?jobs:-j%jobs} # mono is not strictly -j safe
+%{__make} EXTERNAL_MCS=false EXTERNAL_RUNTIME=false #%{?jobs:-j%jobs} # mono is not strictly -j safe
# This gets installed in the build dir so that it gets wiped away
# and not installed on the system
%{__make} install
@@ -304,39 +343,46 @@
find %{_builddir}/install -name \*.la -delete
popd
# Configure against the junk install of mono
-# No, don't...
-#export PATH=%{_builddir}/install/bin:${PATH}
-#export LD_LIBRARY_PATH=%{_builddir}/install/lib:${LD_LIBRARY_PATH}
-#export PKG_CONFIG_PATH=%{_builddir}/install/lib/pkgconfig:${PKG_CONFIG_PATH}
+export PATH=%{_builddir}/install/bin:${PATH}
+export LD_LIBRARY_PATH=%{_builddir}/install/lib:${LD_LIBRARY_PATH}
+export PKG_CONFIG_PATH=%{_builddir}/install/lib/pkgconfig:${PKG_CONFIG_PATH}
# And then we build moonlight
# Only needed when there are Makefile.am or configure.ac patches
-#autoreconf -f -i -Wnone
+autoreconf -f -i -Wnone
%configure --without-testing --without-performance --without-examples \
--disable-debug --disable-sanity \
+ %{desktop_support} \
--with-mcspath=%{_builddir}/mono-%{included_mono}/mcs \
- --with-mono-basic-path=%{_builddir}/mono-basic-%{included_mono} \
+ --with-mono-basic-path=%{_builddir}/mono-basic-%{included_basic} \
--with-ffmpeg=%{with_ffmpeg} \
--with-cairo=%{with_cairo}
# We need the system gac for gtk-sharp
# Only if we're linking to the junk mono
-#export MONO_GAC_PREFIX=%{_builddir}/install:%{_prefix}
+export MONO_GAC_PREFIX=%{_builddir}/install:%{_prefix}
%{__make} %{?jobs:-j%jobs}
%install
+export PATH=%{_builddir}/install/bin:${PATH}
+export LD_LIBRARY_PATH=%{_builddir}/install/lib:${LD_LIBRARY_PATH}
+export PKG_CONFIG_PATH=%{_builddir}/install/lib/pkgconfig:${PKG_CONFIG_PATH}
%{__make} install DESTDIR=%{buildroot}
-# Nuke the plugin RPM for now
-rm -rf %{buildroot}%{_libdir}/moonlight/plugin
# Copy the custom libmono.so.0 for the plugin to use
-# This didn't work
-#cp %{_builddir}/install/lib/libmono.so.0 %{buildroot}%{_libdir}/moonlight/plugin/
+install -m 644 %{_builddir}/install/lib/libmono.so.0 %{buildroot}%{_libdir}/moonlight/
+# Make the loader pull in the correct libmono
+chrpath -r %{_libdir}/moonlight %{buildroot}%{_libdir}/moonlight/plugin/libmoonplugin.so
+chrpath -r %{_libdir}/moonlight %{buildroot}%{_libdir}/moonlight/plugin/libmoonplugin.so
# Symlink the loader into browser-plugins for SUSE
# plugin package was nuked for now
-#%if 0%{?suse_version}
-#mkdir -p %{buildroot}%{_libdir}/browser-plugins
-#ln -s %{_libdir}/moonlight/plugin/libmoonloader.so %{buildroot}%{_libdir}/browser-plugins/libmoonloader.so
-#%endif
+%if 0%{?suse_version}
+mkdir -p %{buildroot}%{_libdir}/browser-plugins
+ln -s %{_libdir}/moonlight/plugin/libmoonloader.so %{buildroot}%{_libdir}/browser-plugins/libmoonloader.so
+%endif
# We don't like nasty .la files
find %{buildroot} -name \*.la -delete
+%if %{with_desktop} == no
+rm -f %{buildroot}%{_bindir}/xamlg
+rm -f %{buildroot}%{_bindir}/smcs
+%endif
%clean
rm -rf %{buildroot}
++++++ bad-register.patch ++++++
Index: libgc/include/private/gc_locks.h
===================================================================
--- libgc/include/private/gc_locks.h (revision 153123)
+++ libgc/include/private/gc_locks.h (working copy)
@@ -403,7 +403,7 @@
{
char result;
__asm__ __volatile__("lock; cmpxchgl %2, %0; setz %1"
- : "+m"(*(addr)), "=r"(result)
+ : "+m"(*(addr)), "=q"(result)
: "r" (new_val), "a"(old) : "memory");
return (GC_bool) result;
}
++++++ mono-2.6.tar.bz2 -> mono-2.6.1.tar.bz2 ++++++
moonlight/mono-2.6.tar.bz2 /mounts/work_src_done/STABLE/moonlight/mono-2.6.1.tar.bz2 differ: char 11, line 1
++++++ mono-basic-2.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-basic-2.6/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog new/mono-basic-2.6/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
--- old/mono-basic-2.6/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog 2009-12-17 00:40:07.000000000 +0100
+++ new/mono-basic-2.6/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog 2010-02-25 19:45:20.000000000 +0100
@@ -1,3 +1,9 @@
+2009-12-18 Rolf Bjarne Kvinge