From 59eb2602c82217056cdb332ae469e290a392427f513140791c1c5f7141815461 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 3 Aug 2007 19:47:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=11 --- mono-1.2.4.tar.bz2 | 3 - mono-1.2.5.tar.bz2 | 3 + mono-config_rpm_requires.patch | 114 ----------------------- mono-core.changes | 40 ++++++++ mono-core.spec | 73 ++++++++++----- mono-provides_fix_r76875.patch | 26 ------ mono-r77377_fix_ia64_find-requires.patch | 10 -- mono-r78768_ppc_pointer_cast.patch | 20 ---- mono-r81450_fix_ia64_find-requires.patch | 21 ----- 9 files changed, 93 insertions(+), 217 deletions(-) delete mode 100644 mono-1.2.4.tar.bz2 create mode 100644 mono-1.2.5.tar.bz2 delete mode 100644 mono-config_rpm_requires.patch delete mode 100644 mono-provides_fix_r76875.patch delete mode 100644 mono-r77377_fix_ia64_find-requires.patch delete mode 100644 mono-r78768_ppc_pointer_cast.patch delete mode 100644 mono-r81450_fix_ia64_find-requires.patch diff --git a/mono-1.2.4.tar.bz2 b/mono-1.2.4.tar.bz2 deleted file mode 100644 index d7b2791..0000000 --- a/mono-1.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:780987a48256e6aff4206364a59f131a9aafbd5e3aa36694380d27b1d955176c -size 17146737 diff --git a/mono-1.2.5.tar.bz2 b/mono-1.2.5.tar.bz2 new file mode 100644 index 0000000..9a854ee --- /dev/null +++ b/mono-1.2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec29da2a97cb0e171928141e9a53d6b5c9e3cd6cd7b0d26f4353f8bde4d0d57a +size 17953355 diff --git a/mono-config_rpm_requires.patch b/mono-config_rpm_requires.patch deleted file mode 100644 index 3f342b5..0000000 --- a/mono-config_rpm_requires.patch +++ /dev/null @@ -1,114 +0,0 @@ -Index: scripts/mono-find-provides.in -=================================================================== ---- scripts/mono-find-provides.in (revision 76729) -+++ scripts/mono-find-provides.in (working copy) -@@ -17,19 +17,15 @@ - #monolist=($(printf "%s\n" "${monolist[@]}" | egrep "/gac/")) - # Disabled... see ChangeLog - --a=`which "$0"` --d=`dirname "$a"` -- - # Set the prefix, unless it is overriden (used when building mono rpms) --: ${prefix=$d/..} -+: ${prefix=@prefix@} - --exec_prefix=$d/.. - libdir=$prefix/@reloc_libdir@ --bindir=$d -+bindir=$prefix/bin - - # Bail out if monodis or libmono is missing - if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then -- echo "monodis missing or unusable, exiting..." -+ echo "monodis missing or unusable, exiting..." 1>&2 - exit 1 - fi - -Index: scripts/mono-find-requires.in -=================================================================== ---- scripts/mono-find-requires.in (revision 76729) -+++ scripts/mono-find-requires.in (working copy) -@@ -12,22 +12,29 @@ - filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) - monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) - --a=`which "$0"` --d=`dirname "$a"` -+# parse .config files to find which native libraries to depend on -+# (target attribute must have double quotes for this to work, ie: target="file" ) -+# Add /etc/mono/config ? -+configlist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.config\$")) - - # Set the prefix, unless it is overriden (used when building mono rpms) --: ${prefix=$d/..} -+: ${prefix=@prefix@} - --exec_prefix=$d/.. - libdir=$prefix/@reloc_libdir@ --bindir=$d -+bindir=$prefix/bin - - # Bail out if monodis or libmono is missing - if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then -- echo "monodis missing or unusable, exiting..." -+ echo "monodis missing or unusable, exiting..." 1>&2 - exit 1 - fi - -+# special case for 64bit archs -+if test "x@reloc_libdir@" = "xlib64" ; then -+ libext="()(64bit)" -+else -+ libext="" -+fi - - # set LD_LIBRARY_PATH to ensure that libmono.so is found - export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -@@ -55,6 +62,46 @@ - } - ') 2> /dev/null - done -+ # Parse the xml .config files to see what native binaries we call into -+ for i in "${configlist[@]}"; do -+ awk 'match($_, //dev/null -+ done - ) - - PROVIDES=$( diff --git a/mono-core.changes b/mono-core.changes index 7b2b683..519a499 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Fri Aug 3 17:40:00 CEST 2007 - wberrier@suse.de + +- Update to 1.2.5 + -Fixes for IronPython and Dynamic Language Runtime + -More C# 3.0 compiler features + -2.0 support for AOT assemblies + -Several performance improvements when running IronPython + -Reduced virtual table sizes + -Optimized double to int conversions using SSE2 on x86 + -Proper caching of generic methods + -IL verifier implemented + -HttpWebRequest can now be used with X.509 client certificates + -Added support X.509 Client Certificate Chains for SSL/TLS + -Fixed SSL/TLS not to require exportable private keys for + client certificates + -Implemented import and export of DSA keys CryptoAPI-compatible + BLOB (2.0) + -Added SafeBag handling to Mono.Security's PKCS#12 + -Regioninfo support + -Optimized dictionary type + -New TimeZone implementation + -new 2.0 Winform controls: MaskedTextBox, ToolStripPainter, + ToolStripSystemRenderer + -Mono Cairo API has been updated, it will now expose Cairo + 1.2 API entry points. + +- Don't use 64bit libs on ppc64 in find-requires (runtime is 32bit, + must use 32bit libraries) + +------------------------------------------------------------------- +Mon Jul 30 12:16:15 CEST 2007 - ro@suse.de + +- try to use 64bit libs on ppc64 as well in find-requires + +------------------------------------------------------------------- +Tue Jul 10 14:03:53 MST 2007 - wberrier@novell.com + +- Build against valgrind for 10.3 and above + ------------------------------------------------------------------- Tue Jul 05 20:03:53 MST 2007 - wberrier@novell.com diff --git a/mono-core.spec b/mono-core.spec index b767cf3..fb68f73 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -1,5 +1,5 @@ # -# spec file for package mono-core (Version 1.2.4) +# spec file for package mono-core (Version 1.2.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,15 +15,10 @@ License: LGPL v2 or later Group: Development/Languages/Mono Summary: A .NET Runtime Environment URL: http://go-mono.org/ -Version: 1.2.4 -Release: 16 +Version: 1.2.5 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 -Patch26: mono-r78768_ppc_pointer_cast.patch -Patch28: mono-config_rpm_requires.patch -Patch29: mono-provides_fix_r76875.patch -Patch30: mono-r77377_fix_ia64_find-requires.patch -Patch31: mono-r81450_fix_ia64_find-requires.patch ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -48,12 +43,16 @@ Requires: libgdiplus # pulled in when libgdiplus is installed Recommends: libgdiplus %endif -BuildRequires: bc glib2-devel +BuildRequires: glib2-devel #### suse options #### %if 0%{?suse_version} # For some reason these weren't required in 10.2 and before... ? %if %{suse_version} > 1020 BuildRequires: bison +# Add valgrind support for 10.3 and above on supported platforms +%ifarch i586 x86_64 ppc ppc64 +BuildRequires: valgrind +%endif %endif %if %{sles_version} == 9 %define configure_options export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig @@ -114,6 +113,7 @@ Authors: %_bindir/gacutil %_bindir/gmcs %_bindir/mcs +%_bindir/smcs %_bindir/mozroots %_bindir/setreg %_bindir/sn @@ -452,7 +452,8 @@ Summary: Database connectivity for Mono Group: Development/Languages/Mono Requires: mono-core == %version-%release Requires: mono-data == %version-%release -Requires: sqlite2 +# TODO: Disable this, until a better solution is found +#Requires: sqlite2 %description -n mono-data-sqlite The Mono Project is an open development initiative that is working to @@ -820,6 +821,7 @@ Authors: %_mandir/man1/al.1.gz %_mandir/man1/mono-xmltool.1.gz %_mandir/man1/vbnc.1.gz +%_mandir/man1/resgen.1.gz # Shell wrappers %_bindir/al %_bindir/al2 @@ -836,8 +838,8 @@ Authors: %_bindir/makecert %_bindir/mkbundle %_bindir/mkbundle2 -%_bindir/monodiet %_bindir/monodis +%_bindir/monolinker %_bindir/monop %_bindir/monop2 %_bindir/mono-api-diff @@ -856,8 +858,10 @@ Authors: %_bindir/sgen %_bindir/signcode %_bindir/xbuild +%_mandir/man1/monolinker.1.gz %_prefix/lib/mono/gac/PEAPI %_prefix/lib/mono/1.0/PEAPI.dll +%_prefix/lib/mono/1.0/monolinker.* %_prefix/lib/mono/2.0/PEAPI.dll %_prefix/lib/mono/gac/Microsoft.Build.Tasks %_prefix/lib/mono/2.0/Microsoft.Build.Tasks.dll @@ -867,6 +871,7 @@ Authors: %_prefix/lib/mono/2.0/Microsoft.Build.Utilities.dll %_prefix/lib/mono/gac/Microsoft.Build.Engine %_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll +%_prefix/lib/mono/gac/Mono.Cecil %_bindir/monograph %_prefix/include/mono-1.0 %_libdir/libmono-profiler-cov.* @@ -922,21 +927,13 @@ Authors: %dir %_prefix/lib/mono/compat-2.0 %prep %setup -q -n mono-%{version} -%patch26 -%patch28 -%patch29 -%patch30 -%patch31 %build -# What's this for? -rm -f libgc/libtool.m4 -autoreconf --force --install -autoreconf --force --install libgc +# These are only needed if there are patches to the runtime +#rm -f libgc/libtool.m4 +#autoreconf --force --install +#autoreconf --force --install libgc export CFLAGS=" $RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-strict-aliasing" -# From the buildbuddy config -# This is set by default by autoconf, don't need it -#export CFLAGS="$CFLAGS -O2" # distro specific configure options %{?configure_options} %configure \ @@ -1018,6 +1015,36 @@ rm -f ./usr/lib/mono/1.0/culevel.exe* rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Aug 03 2007 - wberrier@suse.de +- Update to 1.2.5 + -Fixes for IronPython and Dynamic Language Runtime + -More C# 3.0 compiler features + -2.0 support for AOT assemblies + -Several performance improvements when running IronPython + -Reduced virtual table sizes + -Optimized double to int conversions using SSE2 on x86 + -Proper caching of generic methods + -IL verifier implemented + -HttpWebRequest can now be used with X.509 client certificates + -Added support X.509 Client Certificate Chains for SSL/TLS + -Fixed SSL/TLS not to require exportable private keys for + client certificates + -Implemented import and export of DSA keys CryptoAPI-compatible + BLOB (2.0) + -Added SafeBag handling to Mono.Security's PKCS#12 + -Regioninfo support + -Optimized dictionary type + -New TimeZone implementation + -new 2.0 Winform controls: MaskedTextBox, ToolStripPainter, + ToolStripSystemRenderer + -Mono Cairo API has been updated, it will now expose Cairo + 1.2 API entry points. +- Don't use 64bit libs on ppc64 in find-requires (runtime is 32bit, + must use 32bit libraries) +* Mon Jul 30 2007 - ro@suse.de +- try to use 64bit libs on ppc64 as well in find-requires +* Tue Jul 10 2007 - wberrier@novell.com +- Build against valgrind for 10.3 and above * Thu Jul 05 2007 - wberrier@novell.com - mono-find-requires fixes for ia64 (bnc #282877) * Wed Jun 20 2007 - ro@suse.de diff --git a/mono-provides_fix_r76875.patch b/mono-provides_fix_r76875.patch deleted file mode 100644 index 576d461..0000000 --- a/mono-provides_fix_r76875.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: scripts/mono-find-requires.in -=================================================================== ---- scripts/mono-find-requires.in (revision 76874) -+++ scripts/mono-find-requires.in (working copy) -@@ -69,7 +69,9 @@ - ignore=0 - req="" - split($_, toks, "\"") -- for(i=1; i <= length(toks); i++) { -+ toks_size=0 -+ for(tok in toks) { toks_size++ } -+ for(i=1; i <= toks_size; i++) { - if(toks[i] ~ /target=/) { - req=toks[i+1] - } -@@ -84,7 +86,9 @@ - } - - split(attr, os_targets, ",") -- for(j=1; j <= length(os_targets); j++) { -+ os_targets_size=0 -+ for(os_target in os_targets) { os_targets_size++ } -+ for(j=1; j <= os_targets_size; j++) { - if(os_targets[j] == "linux") { - found=1 - } diff --git a/mono-r77377_fix_ia64_find-requires.patch b/mono-r77377_fix_ia64_find-requires.patch deleted file mode 100644 index 63c2dfe..0000000 --- a/mono-r77377_fix_ia64_find-requires.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config -=================================================================== ---- mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config (revision 77376) -+++ mcs/tools/mono-shlib-cop/mono-shlib-cop.exe.config (revision 77377) -@@ -1,5 +1,4 @@ - -- - - - diff --git a/mono-r78768_ppc_pointer_cast.patch b/mono-r78768_ppc_pointer_cast.patch deleted file mode 100644 index e12ee45..0000000 --- a/mono-r78768_ppc_pointer_cast.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mono/io-layer/atomic.h -+++ mono/io-layer/atomic.h -@@ -475,7 +475,7 @@ - return result - 1; - } - --#define InterlockedCompareExchangePointer(dest,exch,comp) InterlockedCompareExchange((volatile gint32 *)(dest), (gint32)(exch), (gint32)(comp)) -+#define InterlockedCompareExchangePointer(dest,exch,comp) (gpointer)InterlockedCompareExchange((volatile gint32 *)(dest), (gint32)(exch), (gint32)(comp)) - - static inline gint32 InterlockedCompareExchange(volatile gint32 *dest, - gint32 exch, gint32 comp) { -@@ -504,7 +504,7 @@ - : "=r" (tmp) : "0" (tmp), "b" (dest), "r" (exch): "cc", "memory"); - return(tmp); - } --#define InterlockedExchangePointer(dest,exch) InterlockedExchange((volatile gint32 *)(dest), (gint32)(exch)) -+#define InterlockedExchangePointer(dest,exch) (gpointer)InterlockedExchange((volatile gint32 *)(dest), (gint32)(exch)) - - static inline gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add) - { diff --git a/mono-r81450_fix_ia64_find-requires.patch b/mono-r81450_fix_ia64_find-requires.patch deleted file mode 100644 index 852a00a..0000000 --- a/mono-r81450_fix_ia64_find-requires.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: scripts/mono-find-requires.in -=================================================================== ---- scripts/mono-find-requires.in (revision 81444) -+++ scripts/mono-find-requires.in (working copy) -@@ -33,9 +33,16 @@ - if test "x@reloc_libdir@" = "xlib64" ; then - libext="()(64bit)" - else -+ # (note, this works on ppc64 since we only have 32bit mono - libext="" - fi - -+# Exceptions: -+case `uname -m` in -+ # ia64 doesn't use lib64 for 'libdir' (sles 9 rpm used to provide both... no longer) -+ ia64) libext="()(64bit)" ;; -+esac -+ - # set LD_LIBRARY_PATH to ensure that libmono.so is found - export LD_LIBRARY_PATH=$libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} -