From 93f2c020da4144d8d238e47cd221f05ec31ca4ea48a13482dfdc8580a7473bf4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 17 May 2008 09:23:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=22 --- mono-1.9.1.tar.bz2 | 3 ++ mono-1.9.tar.bz2 | 3 -- mono-core-arg_max.diff | 4 +-- mono-core.changes | 37 ++++++++++++++++++++++ mono-core.spec | 70 +++++++++++++++++++++++++++++++++++++----- mono-libtool.diff | 21 ++++++++++--- mono-warn.diff | 11 +++++++ 7 files changed, 131 insertions(+), 18 deletions(-) create mode 100644 mono-1.9.1.tar.bz2 delete mode 100644 mono-1.9.tar.bz2 create mode 100644 mono-warn.diff diff --git a/mono-1.9.1.tar.bz2 b/mono-1.9.1.tar.bz2 new file mode 100644 index 0000000..402c984 --- /dev/null +++ b/mono-1.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397 +size 18429855 diff --git a/mono-1.9.tar.bz2 b/mono-1.9.tar.bz2 deleted file mode 100644 index bc59044..0000000 --- a/mono-1.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fbd27d1ecd6c7202403fd765b56ef48202a572b549aa71ace1f351ad4182d6b -size 18416956 diff --git a/mono-core-arg_max.diff b/mono-core-arg_max.diff index b00a02e..8c48f64 100644 --- a/mono-core-arg_max.diff +++ b/mono-core-arg_max.diff @@ -1,5 +1,5 @@ ---- mono/io-layer/wapi_glob.c -+++ mono/io-layer/wapi_glob.c +--- mono/mono/io-layer/wapi_glob.c ++++ mono/mono/io-layer/wapi_glob.c @@ -300,7 +300,7 @@ pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; diff --git a/mono-core.changes b/mono-core.changes index cf8bf55..4da416c 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Mon May 12 10:13:19 CEST 2008 - aj@suse.de + +- Do not return random data in function. + +------------------------------------------------------------------- +Tue May 6 13:34:26 CEST 2008 - schwab@suse.de + +- Don't use libtool before it is created. + +------------------------------------------------------------------- +Fri Apr 25 10:23:23 MST 2008 - wberrier@suse.de + +- Make sure x11 headers/libs are installed so that + /etc/mono/config has correct link to libX11.so.6. + Fixes (bnc#339712) + +------------------------------------------------------------------- +Tue Apr 22 10:23:23 MST 2008 - wberrier@suse.de + +- Update to 1.9.1 (bugfix release) + -G_DECL fixes + -Microsoft.CSharp: Emit bodyless getters and setters for abstract + properties + -ASP.NET: Don't output a date header from System.Web + -Fix an issue with Groupwise WSDL + -Mono.Mozilla: Support more than one browser widget per + application Windows.Forms + -Winforms: + -Finish implementation for EventsTab and PropertiesTab + -Fix keyboard layout issue + -MenuAPI fixes + -System.Design: Cache editor widget instead of creating it each + time + -System.Text: Fix possible integer overflow + -System.Net.Mail: Fix filename handling + ------------------------------------------------------------------- Fri Apr 11 15:45:33 CEST 2008 - schwab@suse.de diff --git a/mono-core.spec b/mono-core.spec index 5f57405..f70a8af 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -1,5 +1,5 @@ # -# spec file for package mono-core (Version 1.9) +# spec file for package mono-core (Version 1.9.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,13 @@ License: LGPL v2.1 or later Group: Development/Languages/Mono Summary: A .NET Runtime Environment Url: http://go-mono.org/ -Version: 1.9 -Release: 7 +Version: 1.9.1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 Patch: mono-core-arg_max.diff Patch1: mono-libtool.diff +Patch2: mono-warn.diff ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -47,6 +48,7 @@ Conflicts: mono-addins <= 0.3 # 1.9 branch conflicts: # Can't do this because this rpm could be used on a distro with gtk# 2.8... #Conflicts: gtk-sharp2 < 2.10.3 +%define arg_max_patch 0 # Require when in the buildserivce %if 0%{?opensuse_bs} Requires: libgdiplus0 @@ -68,21 +70,45 @@ Recommends: libgluezilla0 %endif %endif BuildRequires: glib2-devel +####### distro specific changes ######## +##### #### suse options #### %if 0%{?suse_version} +%if %suse_version >= 1100 +%define arg_max_patch 1 +%endif # For some reason these weren't required in 10.2 and before... ? -%if %{suse_version} > 1020 +%if %{suse_version} >= 1030 BuildRequires: bison # Add valgrind support for 10.3 and above on archs that have it %ifarch %ix86 x86_64 ppc ppc64 BuildRequires: valgrind-devel %endif %endif +%if %{suse_version} >= 1020 +BuildRequires: xorg-x11-libX11 +%endif +%if %{sles_version} == 10 +BuildRequires: xorg-x11-devel +%endif +%if %{suse_version} == 1010 +BuildRequires: xorg-x11-devel +%endif %if %{sles_version} == 9 %define configure_options export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig -BuildRequires: pkgconfig +BuildRequires: XFree86-devel XFree86-libs pkgconfig %endif %endif +# Fedora x11 +%if 0%{?fedora_version} +BuildRequires: libX11 +%endif +# rhel x11 +%if 0%{?rhel_version} +BuildRequires: libX11 +%endif +##### +####### End of distro specific changes ######## # Why was this needed? %ifarch s390 s390x PreReq: grep @@ -1007,13 +1033,16 @@ Authors: %prep %setup -q -n mono-%{version} -%patch -%patch1 +if [ %arg_max_patch -eq 1 ] ; then +%patch -p1 +fi +%patch1 -p1 +%patch2 %build # These are only needed if there are patches to the runtime #rm -f libgc/libtool.m4 -#autoreconf --force --install +autoreconf --force --install #autoreconf --force --install libgc export CFLAGS=" $RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-strict-aliasing" # distro specific configure options @@ -1097,6 +1126,31 @@ rm -f $RPM_BUILD_ROOT/usr/lib/mono/1.0/transform.exe rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon May 12 2008 aj@suse.de +- Do not return random data in function. +* Tue May 06 2008 schwab@suse.de +- Don't use libtool before it is created. +* Fri Apr 25 2008 wberrier@suse.de +- Make sure x11 headers/libs are installed so that + /etc/mono/config has correct link to libX11.so.6. + Fixes (bnc#339712) +* Tue Apr 22 2008 wberrier@suse.de +- Update to 1.9.1 (bugfix release) + -G_DECL fixes + -Microsoft.CSharp: Emit bodyless getters and setters for abstract + properties + -ASP.NET: Don't output a date header from System.Web + -Fix an issue with Groupwise WSDL + -Mono.Mozilla: Support more than one browser widget per + application Windows.Forms + -Winforms: + -Finish implementation for EventsTab and PropertiesTab + -Fix keyboard layout issue + -MenuAPI fixes + -System.Design: Cache editor widget instead of creating it each + time + -System.Text: Fix possible integer overflow + -System.Net.Mail: Fix filename handling * Fri Apr 11 2008 schwab@suse.de - Work around broken configure script. * Fri Apr 11 2008 aj@suse.de diff --git a/mono-libtool.diff b/mono-libtool.diff index ed689b5..d0154b1 100644 --- a/mono-libtool.diff +++ b/mono-libtool.diff @@ -1,11 +1,22 @@ ---- configure.in -+++ configure.in -@@ -44,7 +44,7 @@ libmono_cflags="" +--- mono-1.9.1/configure.in ++++ mono-1.9.1/configure.in +@@ -44,8 +44,6 @@ libmono_cflags="" libmono_ldflags="" AC_SUBST(libmono_cflags) AC_SUBST(libmono_ldflags) -export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_ldflags=`(if test -x libtool; then ./libtool --config; then libtool --config; fi; echo eval echo \\$export_dynamic_flag_spec) | sh` - AC_SUBST(export_ldflags) +-AC_SUBST(export_ldflags) # Variable to have relocatable .pc files (lib, or lib64) + reloc_libdir=`basename ${libdir}` +@@ -291,6 +289,10 @@ AC_LIBTOOL_WIN32_DLL + #AC_DISABLE_FAST_INSTALL + AM_PROG_LIBTOOL + ++m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) ++export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++AC_SUBST(export_ldflags) ++ + # Test whenever ld supports -version-script + AC_PROG_LD + AC_PROG_LD_GNU diff --git a/mono-warn.diff b/mono-warn.diff new file mode 100644 index 0000000..8370b4a --- /dev/null +++ b/mono-warn.diff @@ -0,0 +1,11 @@ +--- mono/tests/libtest.c ++++ mono/tests/libtest.c +@@ -36,7 +36,7 @@ + #ifdef WIN32 + CoTaskMemAlloc (size); + #else +- g_malloc (size); ++ return g_malloc (size); + #endif + } +