Author: wade
Date: 2008-02-08 17:58:59 -0500 (Fri, 08 Feb 2008)
New Revision: 95310
Added:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-fix_win32.patch
Removed:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-optflags.patch
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
Modified:
trunk/release/macosx/dllmap_munge
trunk/release/macosx/setup-files/postflight
trunk/release/packaging/defs/gnome-sharp2
trunk/release/packaging/defs/gtksourceview2-sharp
trunk/release/packaging/defs/mono
trunk/release/packaging/defs/monodevelop
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
trunk/release/packaging/rpm_defs/gtk-sharp2/gtk-sharp2.spec
trunk/release/packaging/rpm_defs/monodevelop/monodevelop.spec
Log:
Changes for 1.9 and previews
also: md 0.19 changes
gtk# 2.10.3 / gnome# 2.16.1
-remove upstream patches
Mac installer updates:
-dllmap_munge: update gtksv path that's built on mac
-postflight: full path
Modified: trunk/release/macosx/dllmap_munge
===================================================================
--- trunk/release/macosx/dllmap_munge 2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/macosx/dllmap_munge 2008-02-08 22:58:59 UTC (rev 95310)
@@ -41,7 +41,7 @@
# gtksourceview2-sharp
'libgobject-2.0.so.0': 'libgobject-2.0.0.dylib',
'libglib-2.0.so.0': 'libglib-2.0.0.dylib',
- 'libgtksourceview-2.0.so.0': 'libgtksourceview-2.0.dylib',
+ 'libgtksourceview-2.0.0.dylib': '',
# shlib-cop
'libgmodule-2.0.so.0': 'libgmodule-2.0.0.dylib',
Modified: trunk/release/macosx/setup-files/postflight
===================================================================
--- trunk/release/macosx/setup-files/postflight 2008-02-08 22:50:37 UTC (rev
95309)
+++ trunk/release/macosx/setup-files/postflight 2008-02-08 22:58:59 UTC (rev
95310)
@@ -22,6 +22,10 @@
done)
done
+# Make sure we run the files we lay down, and not other stuff installed
+# on the system
+export PATH=/Library/Frameworks/Mono.framework/Versions/Current/bin:$PATH
+
# gtk+ setup
cd /Library/Frameworks/Mono.framework/Versions/Current/etc
gdk-pixbuf-query-loaders > gtk-2.0/gdk-pixbuf.loaders
Modified: trunk/release/packaging/defs/gnome-sharp2
===================================================================
--- trunk/release/packaging/defs/gnome-sharp2 2008-02-08 22:50:37 UTC (rev
95309)
+++ trunk/release/packaging/defs/gnome-sharp2 2008-02-08 22:58:59 UTC (rev
95310)
@@ -49,9 +49,6 @@
}
win_4_i386_ZIP_BUILD () {
- # Make sure it's not dependent on cygwin
- # Fixed at least in 2.8.2
- #export CC="gcc -mno-cygwin"
CSC=`cygpath -d /cygdrive/c/WINDOWS/Microsoft.NET/Framework/v1.1.4322`
CSC=`cygpath -a $CSC`
@@ -67,10 +64,6 @@
./configure --prefix=/tmp/install
- # let's just skip the gnomevfs sample instead of disabling gnome-vfs
- # Unnecessary in 2.8.1... doh, still another problem: Mono.GetOptions
isn't on mssdk
- sed -i "s/gnomevfs valtest/valtest/" sample/Makefile
-
# Clean up the MS gac of gtk-sharp
rm -Rf /cygdrive/c/WINDOWS/ASSEMBLY/GAC/*-sharp
rm -Rf /cygdrive/c/WINDOWS/ASSEMBLY/GAC/*gtk-dotnet
Modified: trunk/release/packaging/defs/gtksourceview2-sharp
===================================================================
--- trunk/release/packaging/defs/gtksourceview2-sharp 2008-02-08 22:50:37 UTC
(rev 95309)
+++ trunk/release/packaging/defs/gtksourceview2-sharp 2008-02-08 22:58:59 UTC
(rev 95310)
@@ -1,31 +1,29 @@
web_index=7
BUILD_HOSTS=(
- suse-103-x86_64
+ macos-10-x86
)
USE_HOSTS=(
- suse-103-i586
- suse-103-x86_64
macos-10-ppc
macos-10-x86
)
get_destroot () {
- DEST_ROOT=noarch
+ DEST_ROOT=macos-10-x86
}
MONO_DEPS=(
mono
monodoc
gtk-sharp210
- gnome-sharp2
)
MONO_RECOMMEND_DEPS=(
libgdiplus
)
+# Hrm... we need to build this on mac instead...
macos_10_ppc_ZIP_DEPS=(
http://primates.ximian.com/~wberrier/macos/deps/ppc/gtksourceview-2.0.2-0.macos10.novell.ppc.zip
)
@@ -34,10 +32,29 @@
http://primates.ximian.com/~wberrier/macos/deps/x86/gtksourceview-2.0.2-0.macos10.novell.x86.zip
)
+macos_10_ZIP_BUILD () {
+
+ # This is so we can use the relocated mono (Will probably have to do
this for all builds on mac)
+ export MONO_GAC_PREFIX=/tmp/build_deps
+ export MONO_PREFIX=/tmp/build_deps
+ export MONO_CFG_DIR=/tmp/build_deps/etc
+ export MONO_PATH=/tmp/build_deps/lib
+
+ # We have a libxml-2.0.pc file... even though mac doesn't ship with
pkg-config :)
+ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig
+ ./configure --prefix=/tmp/install
+ make || exit 1
+
+ make install
+ mkdir -p /tmp/install/share/pkgconfig
+ mv /tmp/install/lib/pkgconfig/gtksourceview2-sharp.pc
/tmp/install/share/pkgconfig
+
+}
+
HEAD_PATH=(
trunk/gtksourceview2-sharp
)
+
RELEASE_PATH=(
tags/gtksourceview-sharp-[[version]]
)
-
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/defs/mono 2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,6 +1,6 @@
web_index=0
-USE_PATCHES=1
+#USE_PATCHES=1
BUILD_HOSTS=(
debian-4-arm
@@ -137,9 +137,6 @@
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-0.macos10.novell.ppc.zip
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-0.macos10.novell.ppc.zip
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-0.macos10.novell.ppc.zip
-
- # Temporarily inject updated mwf (need to name this file so it gets
unpacked last)
-
http://primates.ximian.com/~wberrier/macos/deps/various/native_mwf-1.2.6_updated.tar.gz
)
macos_10_x86_ZIP_DEPS=(
@@ -147,9 +144,6 @@
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-0.macos10.novell.x86.zip
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-0.macos10.novell.x86.zip
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-0.macos10.novell.x86.zip
-
- # Temporarily inject updated mwf (need to name this file so it gets
unpacked last)
-
http://primates.ximian.com/~wberrier/macos/deps/various/native_mwf-1.2.6_updated.tar.gz
)
sunos_8_sparc_ZIP_BUILD () {
Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop 2008-02-08 22:50:37 UTC (rev
95309)
+++ trunk/release/packaging/defs/monodevelop 2008-02-08 22:58:59 UTC (rev
95310)
@@ -3,8 +3,6 @@
# Not needed anymore... ?
#fresh_checkout=1
-USE_PATCHES=1
-
BUILD_HOSTS=(
suse-101-i586
macos-10-x86
Deleted:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
===================================================================
---
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-enable_win32_gconf.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,51 +0,0 @@
-diff -ru ../old/gnome-sharp-2.16.0/gconf/GConf/gconf-sharp-2.0.pc.in
gnome-sharp-2.16.0/gconf/GConf/gconf-sharp-2.0.pc.in
---- ../old/gnome-sharp-2.16.0/gconf/GConf/gconf-sharp-2.0.pc.in
2006-08-21 10:37:30.000000000 -0600
-+++ gnome-sharp-2.16.0/gconf/GConf/gconf-sharp-2.0.pc.in 2007-12-07
15:02:27.000000000 -0700
-@@ -6,5 +6,4 @@
- Name: GConf#
- Description: GConf# - GConf .NET Binding
- Version: @VERSION@
--Requires: gnome-sharp-2.0
--Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp.dll
-r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp-peditors.dll
-+Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gconf-sharp.dll
-diff -ru ../old/gnome-sharp-2.16.0/gconf/GConf/Makefile.in
gnome-sharp-2.16.0/gconf/GConf/Makefile.in
---- ../old/gnome-sharp-2.16.0/gconf/GConf/Makefile.in 2006-08-21
10:46:22.000000000 -0600
-+++ gnome-sharp-2.16.0/gconf/GConf/Makefile.in 2007-12-07 15:01:20.000000000
-0700
-@@ -231,10 +231,9 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
[EMAIL PROTECTED]@TARGET =
[EMAIL PROTECTED]@TARGET = $(ASSEMBLY) $(ASSEMBLY).config
[EMAIL PROTECTED]@pkgconfigdir = $(libdir)/pkgconfig
[EMAIL PROTECTED]@pkgconfig_DATA = gconf-sharp-2.0.pc
-+TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = gconf-sharp-2.0.pc
- noinst_DATA = $(TARGET) $(POLICY_ASSEMBLIES)
- CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk $(POLICY_ASSEMBLIES)
$(POLICY_CONFIGS)
- DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config
-@@ -260,7 +259,7 @@
- NotifyWrapper.cs \
- Value.cs
-
--build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs
-+build_sources = $(addprefix $(srcdir)/, $(sources))
- @[EMAIL PROTECTED] =
- @[EMAIL PROTECTED] = $(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk
$(ASSEMBLY)
- all: all-am
-@@ -455,9 +454,12 @@
- gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
- cp $(top_srcdir)/gtk-sharp.snk .
-
--$(ASSEMBLY): $(build_sources) gtk-sharp.snk
-+AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
-+ cp $(top_builddir)/AssemblyInfo.cs .
-+
-+$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
- @rm -f $(ASSEMBLY).mdb
-- $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references)
$(build_sources)
-+ $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references)
$(build_sources) AssemblyInfo.cs
- $(GAPI_CDECL_INSERT)
-
- $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
Added: trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-fix_win32.patch
===================================================================
--- trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-fix_win32.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-fix_win32.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -0,0 +1,24 @@
+diff -ru old/gnome-sharp-2.16.1/Makefile.in gnome-sharp-2.16.1/Makefile.in
+--- old/gnome-sharp-2.16.1/Makefile.in 2008-01-24 14:57:28.000000000 -0700
++++ gnome-sharp-2.16.1/Makefile.in 2008-02-08 11:39:55.308500000 -0700
+@@ -232,7 +232,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = sources art gnomevfs gnome gtkhtml gconf rsvg vte sample
++SUBDIRS = sources art gconf rsvg sample
+ EXTRA_DIST = \
+ gtk-sharp.snk \
+ gapi-cdecl-insert \
+diff -ru old/gnome-sharp-2.16.1/sample/Makefile.in
gnome-sharp-2.16.1/sample/Makefile.in
+--- old/gnome-sharp-2.16.1/sample/Makefile.in 2008-01-24 14:57:27.000000000
-0700
++++ gnome-sharp-2.16.1/sample/Makefile.in 2008-02-08 11:53:59.871000000
-0700
+@@ -217,7 +217,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = gconf rsvg gnomevfs
++SUBDIRS = rsvg gnomevfs
+ @[EMAIL PROTECTED] =
+ @[EMAIL PROTECTED] = gnome-hello-world.exe canvas-example.exe fifteen.exe
print.exe
+ @[EMAIL PROTECTED] =
Deleted:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
===================================================================
--- trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,11 +0,0 @@
---- gnome-sharp/sample/gconf/Makefile.am
-+++ gnome-sharp/sample/gconf/Makefile.am
-@@ -24,7 +24,7 @@
- Settings.cs: $(SCHEMA)
- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH}
$(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) >
Settings.cs
-
--install-hook:
-+install-data-hook:
- GCONF_CONFIG_SOURCE="" gconftool-2 --makefile-install-rule $(SCHEMA)
-
- CLEANFILES = sample.exe Settings.cs
Deleted:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-optflags.patch
===================================================================
--- trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-optflags.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-optflags.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,11 +0,0 @@
---- gtk-sharp-2.8.3/configure.in.xx 2007-01-17 15:34:07.000000000 +0100
-+++ gtk-sharp-2.8.3/configure.in 2007-01-17 15:34:16.000000000 +0100
-@@ -58,7 +58,7 @@
- # not 64 bit clean in cross-compile
- AC_CHECK_SIZEOF(void *, 4)
-
--CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow
-Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
-+CFLAGS="-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow
-Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings $CFLAGS"
-
- if test "x$enable_maintainer_mode" = "xyes"; then
- DEBUG_FLAGS='-debug'
Deleted:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
===================================================================
---
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,12 +0,0 @@
-Index: gnome-sharp/gconf/tools/gconfsharp2-schemagen.in
-===================================================================
---- gnome-sharp/gconf/tools/gconfsharp2-schemagen.in (revision 76653)
-+++ gnome-sharp/gconf/tools/gconfsharp2-schemagen.in (working copy)
-@@ -1,6 +1,2 @@
- #!/bin/sh
--
--a=`which "$0"`
--d=`dirname "$a"`
--
[EMAIL PROTECTED]@ $d/../lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
[EMAIL PROTECTED]@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"
Modified: trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
===================================================================
--- trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
2008-02-08 22:58:59 UTC (rev 95310)
@@ -12,15 +12,14 @@
Group: System/GUI/GNOME
Release: 52
Summary: .Net Language Bindings for Gnome
-Patch0: gnome-sharp-optflags.patch
-Patch1: gnome-sharp-makefile.patch
Patch2: gnome-sharp-find_gtkhtml_ver.patch
-Patch3: gnome-sharp-revert_unportable_relocatable.patch
Source: %{_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gtk-sharp2 glade-sharp2 gtk-sharp2-gapi
+%define minimum_glib_sharp_version 2.10.3
+
##### suse ####
%if 0%{?suse_version}
@@ -58,6 +57,7 @@
Requires: gtkhtml-sharp2 = %{version}-%{release}
Requires: rsvg-sharp2 = %{version}-%{release}
Requires: vte-sharp2 = %{version}-%{release}
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n gnome-sharp2-complete
Gtk# is a library that allows you to build fully native graphical GNOME
@@ -71,6 +71,7 @@
Group: System/GUI/GNOME
# Not needed with rpm .config dep search
#Requires: librsvg
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n rsvg-sharp2
This package contains Mono bindings for librsvg.
@@ -80,6 +81,7 @@
Group: System/GUI/GNOME
# Not needed with rpm .config dep search
#Requires: %gtkhtml_requires
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n gtkhtml-sharp2
This package contains Mono bindings for gtkhtml.
@@ -90,6 +92,7 @@
Group: System/GUI/GNOME
# Not needed with rpm .config dep search
#Requires: gnome-vfs2
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n gnome-vfs-sharp2
This package contains Mono bindings gnomevfs.
@@ -100,6 +103,7 @@
Group: System/GUI/GNOME
# Not needed with rpm .config dep search
#Requires: libart_lgpl
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n art-sharp2
This package contains Mono bindings for libart.
@@ -109,6 +113,7 @@
Summary: Mono bindings for vte
# Not needed with rpm .config dep search
#Requires: vte
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n vte-sharp2
This package contains Mono bindings for vte.
@@ -116,6 +121,7 @@
%package -n gconf-sharp2
Summary: Mono bindings for gconf
Group: System/GUI/GNOME
+Requires: glib-sharp2 >= %minimum_glib_sharp_version
%description -n gconf-sharp2
This package contains Mono bindings for gconf and gconf peditors.
@@ -124,10 +130,7 @@
%debug_package
%prep
%setup -q -n %{_name}-%{version}
-%patch0 -p1
-%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
%{?env_options}
Modified: trunk/release/packaging/rpm_defs/gtk-sharp2/gtk-sharp2.spec
===================================================================
--- trunk/release/packaging/rpm_defs/gtk-sharp2/gtk-sharp2.spec 2008-02-08
22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/gtk-sharp2/gtk-sharp2.spec 2008-02-08
22:58:59 UTC (rev 95310)
@@ -88,7 +88,7 @@
# Need to put this stuff down here after Version: gets defined
Version: %_version
-Source: %{_name}-%{version}.tar.bz2
+Source: %{_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -231,13 +231,16 @@
%debug_package
%prep
%setup -q -n %{_name}-%{version}
+
+if [ %version \< 2.10.3 ] ; then
%patch0 -p1
+fi
%if %platform_desktop_split == 0
%patch1 -p1
# 2.8.4 and later on 2.8.x branch doesn't need this patch
-if [ %version <= 2.8.3 ] ; then
+if [ %version \< 2.8.4 ] ; then
%patch2
fi
Deleted: trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,22 +0,0 @@
-Index: mono/mono/mini/mini-ppc.c
-===================================================================
---- mono/mono/mini/mini-ppc.c (revision 92013)
-+++ mono/mono/mini/mini-ppc.c (revision 92014)
-@@ -316,7 +316,7 @@
-
- g_assert ((code - start) <= 16);
-
-- mono_arch_flush_icache (code, 16);
-+ mono_arch_flush_icache (start, 16);
- cached = start;
- mono_mini_arch_unlock ();
- return cached;
-@@ -350,7 +350,7 @@
-
- g_assert ((code - start) <= size);
-
-- mono_arch_flush_icache (code, size);
-+ mono_arch_flush_icache (start, size);
- cache [sig->param_count] = start;
- mono_mini_arch_unlock ();
- return start;
Deleted:
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
===================================================================
---
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
2008-02-08 22:50:37 UTC (rev 95309)
+++
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
2008-02-08 22:58:59 UTC (rev 95310)
@@ -1,12 +0,0 @@
-Index: monodevelop/monodevelop.in
-===================================================================
---- monodevelop/monodevelop.in (revision 94432)
-+++ monodevelop/monodevelop.in (revision 94433)
-@@ -30,6 +30,7 @@
- mozilla_script=$(which mozilla 2> /dev/null)
- firefox_script=$(which firefox 2> /dev/null)
-
-+ if [ -z $mozilla_script ] && [ -z $firefox_script ]; then return; fi
- for runtime_script in "$firefox_script $mozilla_script"; do
- MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null |
cut -d '"' -f 2 | cut -d '=' -f 2)
- if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
Modified: trunk/release/packaging/rpm_defs/monodevelop/monodevelop.spec
===================================================================
--- trunk/release/packaging/rpm_defs/monodevelop/monodevelop.spec
2008-02-08 22:50:37 UTC (rev 95309)
+++ trunk/release/packaging/rpm_defs/monodevelop/monodevelop.spec
2008-02-08 22:58:59 UTC (rev 95310)
@@ -15,6 +15,7 @@
BuildArch: noarch
Requires: xsp
Requires: mono-basic
+Requires: pkgconfig
PreReq: shared-mime-info
@@ -74,11 +75,13 @@
%{_prefix}/bin/*
%{_prefix}/share/applications/monodevelop.desktop
%{_prefix}/share/mime/packages/monodevelop.xml
-%{_prefix}/share/pixmaps/monodevelop.png
+%{_datadir}/icons/hicolor/*/apps/monodevelop.png
+%{_datadir}/icons/hicolor/scalable/apps/monodevelop.svg
%{_prefix}/lib/monodevelop
%{_prefix}/share/pkgconfig/monodevelop.pc
%{_prefix}/share/pkgconfig/monodevelop-core-addins.pc
%{_mandir}/man1/mdtool.1.gz
+%{_mandir}/man1/monodevelop.1.gz
%post
update-mime-database /usr/share/mime >/dev/null || :
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
