Author: wade
Date: 2007-08-08 17:16:42 -0400 (Wed, 08 Aug 2007)
New Revision: 83695
Added:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
Modified:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-find_gtkhtml_ver.patch
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
Log:
Sync with autobuild:
Add some patches that were in buildservice/autobuild
Make all patches -p1 compatible so they can be used
with the zip build system
Modified:
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-find_gtkhtml_ver.patch
===================================================================
---
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-find_gtkhtml_ver.patch
2007-08-08 21:16:26 UTC (rev 83694)
+++
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-find_gtkhtml_ver.patch
2007-08-08 21:16:42 UTC (rev 83695)
@@ -1,6 +1,6 @@
-diff -ur ../../gtk-sharp-2.8.3/configure.in ./configure.in
---- ../../gtk-sharp-2.8.3/configure.in 2006-07-05 18:09:48.000000000 -0600
-+++ ./configure.in 2007-04-05 20:48:33.000000000 -0600
+diff -ur gtk-sharp-2.8.3/configure.in ./configure.in
+--- gtk-sharp-2.8.3/configure.in 2006-07-05 18:09:48.000000000 -0600
++++ gtk-sharp-2.8.3/configure.in 2007-04-05 20:48:33.000000000 -0600
@@ -114,9 +114,11 @@
if test `uname -s` = "Darwin"; then
LIB_PREFIX=
@@ -69,9 +69,9 @@
else
enable_gtkhtml=no
fi
-diff -ur ../../gtk-sharp-2.8.3/gtkhtml/gtkhtml-sharp.dll.config.in
./gtkhtml/gtkhtml-sharp.dll.config.in
---- ../../gtk-sharp-2.8.3/gtkhtml/gtkhtml-sharp.dll.config.in 2004-10-29
14:33:07.000000000 -0600
-+++ ./gtkhtml/gtkhtml-sharp.dll.config.in 2007-04-05 20:49:30.000000000
-0600
+diff -ur gtk-sharp-2.8.3/gtkhtml/gtkhtml-sharp.dll.config.in
./gtkhtml/gtkhtml-sharp.dll.config.in
+--- gtk-sharp-2.8.3/gtkhtml/gtkhtml-sharp.dll.config.in 2004-10-29
14:33:07.000000000 -0600
++++ gtk-sharp-2.8.3/gtkhtml/gtkhtml-sharp.dll.config.in 2007-04-05
20:49:30.000000000 -0600
@@ -1,4 +1,4 @@
<configuration>
<dllmap dll="libgobject-2.0-0.dll" target="[EMAIL PROTECTED]@[EMAIL
PROTECTED]@"/>
Added: trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
===================================================================
--- trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
2007-08-08 21:16:26 UTC (rev 83694)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-makefile.patch
2007-08-08 21:16:42 UTC (rev 83695)
@@ -0,0 +1,11 @@
+--- 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
Added:
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
2007-08-08 21:16:26 UTC (rev 83694)
+++
trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp-revert_unportable_relocatable.patch
2007-08-08 21:16:42 UTC (rev 83695)
@@ -0,0 +1,12 @@
+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
2007-08-08 21:16:26 UTC (rev 83694)
+++ trunk/release/packaging/rpm_defs/gnome-sharp2/gnome-sharp2.spec
2007-08-08 21:16:42 UTC (rev 83695)
@@ -13,7 +13,9 @@
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
@@ -123,7 +125,9 @@
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
-%patch2
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{?env_options}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
