Permalink
Browse files

sync branch and non specs

svn path=/trunk/release/; revision=118803
  • Loading branch information...
1 parent f9f0083 commit 3a2c46a2dd3947fb0810c46746ed19dd21d6e0d8 Andrew Jorgensen committed Nov 14, 2008
View
2 packaging/rpm_defs/libgdiplus0-branch/libgdiplus0.spec
@@ -1,7 +1,7 @@
%define real_name libgdiplus
Name: libgdiplus0
-Version: 2.0
+Version: 2.2
Release: 11
License: X11/MIT
Url: http://go-mono.org/
View
4 packaging/rpm_defs/mono-branch/mono-core.spec
@@ -5,7 +5,7 @@ License: LGPL v2.1 or later
Group: Development/Languages/Mono
Summary: A .NET Runtime Environment
Url: http://go-mono.org/
-Version: 2.0.1
+Version: 2.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mono-%{version}.tar.bz2
@@ -873,7 +873,7 @@ Requires: glib2-devel
%if 0%{?monobuild}
Requires: libgdiplus0
%else
-Requires: libgdiplus0 = 2.0
+Requires: libgdiplus0 = 2.2
%endif
%description -n mono-devel
View
41 packaging/rpm_defs/mono-debugger-branch/check-build.sh
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2003, 2004 SuSE Linux AG, Germany. All rights reserved.
-#
-# Authors: Thorsten Kukuk <kukuk@suse.de>
-#
-# this script use the following variable(s):
-#
-# - $BUILD_BASENAME
-#
-
-# Mono needs a 2.6.13 kernel on x86-64 machines, it definitly fails with 2.6.5.
-
-case $BUILD_BASENAME in
- *i386*|*i686*|*x86_64*)
- grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null
- if [ $? -ne 1 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2.6.[0-9]-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2.6.1[0-2]-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2\.6\.1[0-2]\.[0-9]*-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- ;;
- *)
- ;;
-esac
-
-exit 0
-
View
47 packaging/rpm_defs/mono-debugger-branch/mono-debugger.spec
@@ -1,47 +1,38 @@
Name: mono-debugger
-License: GNU General Public License (GPL), X11/MIT
-Group: Development/Languages/Other
+License: GPL v2 or later; X11/MIT
+Group: Development/Languages/Mono
Summary: Mono Debugger
-URL: http://www.mono-project.com/Debugger
-Version: 0.60
-Release: 0
+Url: http://www.mono-project.com/Debugger
+Version: 2.2
+Release: 12
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Patch0: mono-debugger_libedit_cast.patch
Provides: mono-debugger = %{version}-%{release}
-ExclusiveArch: %ix86 x86_64
-Requires: mono-core >= 1.1.16
-
-
+ExclusiveArch: %ix86 x86_64
+Requires: mono-core >= 2.0
BuildRequires: mono-devel mono-nunit
-
# For older distros (but are harmless for new distros)
-BuildRequires: pkgconfig mono-web
-
+BuildRequires: mono-web pkgconfig
#### suse options ###
%if 0%{?suse_version}
# factory needed this... ?
# All distro versions need it, but it was installed by default up until 10.3
-%if %{suse_version} > 1020
-BuildRequires: ncurses-devel
+%if 0%{suse_version} > 1020
+BuildRequires: ncurses-devel
%endif
-
# For SLES9
-%if %sles_version == 9
+%if 0%sles_version == 9
%define configure_options export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig
%endif
%endif
-
# Fedora options (Bug in fedora images where 'abuild' user is the same id as 'nobody')
%if 0%{?fedora_version} || 0%{?rhel_version}
%define env_options export MONO_SHARED_DIR=/tmp
-
# Note: this fails to build on fedora5 x86_64 because of this bug:
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=189324
%endif
-
%description
A debugger is an important tool for development. The Mono Debugger
(MDB) can debug both managed and unmanaged applications. It provides a
@@ -58,44 +49,44 @@ Authors:
Chris Toshok <toshok@ximian.com>
Miguel de Icaza <miguel@ximian.com>
-
%files
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog README NEWS
/usr/bin/mdb
%{_libdir}/*.so*
%{_prefix}/lib/mono/2.0/mdb.exe
+%{_prefix}/lib/mono/2.0/mdb-symbolreader.exe
%{_prefix}/lib/mono/gac/Mono.Debugger
+%{_prefix}/lib/mono/gac/Mono.Debugger.SymbolWriter
%{_prefix}/lib/mono/mono-debugger
%{_libdir}/pkgconfig/mono-debugger.pc
-%debug_package
%prep
%setup -q -n mono-debugger-%{version}
-%patch0
%build
%{?env_options}
%{?configure_options}
+CFLAGS="$RPM_OPT_FLAGS"
+%if 0%{suse_version} >= 1100
+CFLAGS="$RPM_OPT_FLAGS `ncurses5-config --cflags`"
+%endif
%configure
make
%install
%{?env_options}
make DESTDIR="$RPM_BUILD_ROOT" install
-
# Remove unnecessary devel files
rm -f $RPM_BUILD_ROOT%_libdir/libmonodebuggerreadline.*a
rm -f $RPM_BUILD_ROOT%_libdir/libmonodebuggerserver.*a
%clean
-#rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
-
%if 0%{?fedora_version} || 0%{?rhel_version}
# Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros)
%define _use_internal_dependency_generator 0
View
21 packaging/rpm_defs/mono-debugger-branch/mono-debugger_libedit_cast.patch
@@ -1,21 +0,0 @@
-diff -ur ./frontend/libedit/term.c ../new/mono-debugger-0.31/frontend/libedit/term.c
---- ./frontend/libedit/term.c 2006-11-14 21:02:36.000000000 +0100
-+++ ../new/mono-debugger-0.31/frontend/libedit/term.c 2006-11-14 21:59:09.000000000 +0100
-@@ -947,7 +947,7 @@
- Val(T_li) = tgetnum("li");
- for (t = tstr; t->name != NULL; t++) {
- /* XXX: some systems' tgetstr needs non const */
-- term_alloc(el, t, tgetstr(strchr(t->name, *t->name),
-+ term_alloc(el, t, (char *)tgetstr(strchr(t->name, *t->name),
- &area));
- }
- }
-@@ -1471,7 +1471,7 @@
- }
- if (t->name == NULL) {
- /* XXX: some systems' tgetstr needs non const */
-- scap = tgetstr(strchr(*argv, **argv), &area);
-+ scap = (char *)tgetstr(strchr(*argv, **argv), &area);
- }
- if (!scap || scap[0] == '\0') {
- if (!silent)
View
41 packaging/rpm_defs/mono-debugger/check-build.sh
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2003, 2004 SuSE Linux AG, Germany. All rights reserved.
-#
-# Authors: Thorsten Kukuk <kukuk@suse.de>
-#
-# this script use the following variable(s):
-#
-# - $BUILD_BASENAME
-#
-
-# Mono needs a 2.6.13 kernel on x86-64 machines, it definitly fails with 2.6.5.
-
-case $BUILD_BASENAME in
- *i386*|*i686*|*x86_64*)
- grep "Linux version 2.[0-5].[0-9][0-9]" /proc/version > /dev/null
- if [ $? -ne 1 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2.6.[0-9]-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2.6.1[0-2]-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- grep "Linux version 2\.6\.1[0-2]\.[0-9]*-" /proc/version > /dev/null
- if [ $? -eq 0 ]; then
- echo "FATAL: kernel too old, need kernel >= 2.6.13 for this package"
- exit 1
- fi
- ;;
- *)
- ;;
-esac
-
-exit 0
-
View
21 packaging/rpm_defs/mono-debugger/mono-debugger_libedit_cast.patch
@@ -1,21 +0,0 @@
-diff -ur ./frontend/libedit/term.c ../new/mono-debugger-0.31/frontend/libedit/term.c
---- ./frontend/libedit/term.c 2006-11-14 21:02:36.000000000 +0100
-+++ ../new/mono-debugger-0.31/frontend/libedit/term.c 2006-11-14 21:59:09.000000000 +0100
-@@ -947,7 +947,7 @@
- Val(T_li) = tgetnum("li");
- for (t = tstr; t->name != NULL; t++) {
- /* XXX: some systems' tgetstr needs non const */
-- term_alloc(el, t, tgetstr(strchr(t->name, *t->name),
-+ term_alloc(el, t, (char *)tgetstr(strchr(t->name, *t->name),
- &area));
- }
- }
-@@ -1471,7 +1471,7 @@
- }
- if (t->name == NULL) {
- /* XXX: some systems' tgetstr needs non const */
-- scap = tgetstr(strchr(*argv, **argv), &area);
-+ scap = (char *)tgetstr(strchr(*argv, **argv), &area);
- }
- if (!scap || scap[0] == '\0') {
- if (!silent)

0 comments on commit 3a2c46a

Please sign in to comment.