rpms/gtk-sharp2/devel gtk-sharp2-2.10.3-assemblydir.patch, NONE, 1.1 gtk-sharp2.spec, 1.27, 1.28

Xavier LAMIEN (laxathom) fedora-extras-commits at redhat.com
Tue Mar 4 22:55:50 UTC 2008 

Author: laxathom

Update of /cvs/pkgs/rpms/gtk-sharp2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26825

Modified Files:
	gtk-sharp2.spec 
Added Files:
	gtk-sharp2-2.10.3-assemblydir.patch 
Log Message:
updated files & added new patch

gtk-sharp2-2.10.3-assemblydir.patch:

--- NEW FILE gtk-sharp2-2.10.3-assemblydir.patch ---
diff -up gtk-sharp-2.10.3/gdk/Makefile.in.old gtk-sharp-2.10.3/gdk/Makefile.in
--- gtk-sharp-2.10.3/gdk/Makefile.in.old	2008-03-04 19:30:47.000000000 +0100
+++ gtk-sharp-2.10.3/gdk/Makefile.in	2008-03-04 19:31:18.000000000 +0100
@@ -296,7 +296,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/Makefile.include.old gtk-sharp-2.10.3/Makefile.include
--- gtk-sharp-2.10.3/Makefile.include.old	2008-03-04 19:26:03.000000000 +0100
+++ gtk-sharp-2.10.3/Makefile.include	2008-03-04 19:26:43.000000000 +0100
@@ -54,7 +54,7 @@ $(POLICY_ASSEMBLIES): $(top_builddir)/po
 	done
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
diff -up gtk-sharp-2.10.3/parser/Makefile.in.old gtk-sharp-2.10.3/parser/Makefile.in
--- gtk-sharp-2.10.3/parser/Makefile.in.old	2008-03-04 22:56:24.000000000 +0100
+++ gtk-sharp-2.10.3/parser/Makefile.in	2008-03-04 22:56:52.000000000 +0100
@@ -209,7 +209,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 pkgconfigdir = $(libdir)/pkgconfig
 assembly_DATA = gapi-fixup.exe gapi-parser.exe
 pkgconfig_DATA = gapi-2.0.pc
diff -up gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in
--- gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in.old	2008-03-04 19:29:17.000000000 +0100
+++ gtk-sharp-2.10.3/sample/GtkDemo/Makefile.in	2008-03-04 19:29:48.000000000 +0100
@@ -194,7 +194,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
-references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@
+references = $(addprefix /r:, $(assemblies)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 TARGETS = GtkDemo.exe
 DEBUGS = $(addsuffix .mdb, $(TARGETS)) 
 CLEANFILES = $(TARGETS) $(DEBUGS)
diff -up gtk-sharp-2.10.3/pango/Makefile.in.old gtk-sharp-2.10.3/pango/Makefile.in
--- gtk-sharp-2.10.3/pango/Makefile.in.old	2008-03-03 14:14:07.000000000 +0100
+++ gtk-sharp-2.10.3/pango/Makefile.in	2008-03-03 14:19:10.000000000 +0100
@@ -282,7 +282,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/generator/Makefile.in.old gtk-sharp-2.10.3/generator/Makefile.in
--- gtk-sharp-2.10.3/generator/Makefile.in.old	2008-03-04 22:57:56.000000000 +0100
+++ gtk-sharp-2.10.3/generator/Makefile.in	2008-03-04 22:58:16.000000000 +0100
@@ -205,7 +205,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-assemblydir = $(prefix)/lib/gtk-sharp-2.0
+assemblydir = $(libdir)/gtk-sharp-2.0
 assembly_DATA = gapi_codegen.exe
 bin_SCRIPTS = gapi2-codegen
 CLEANFILES = gapi_codegen.exe
diff -up gtk-sharp-2.10.3/glade/Makefile.in.old gtk-sharp-2.10.3/glade/Makefile.in
--- gtk-sharp-2.10.3/glade/Makefile.in.old	2008-03-04 19:26:56.000000000 +0100
+++ gtk-sharp-2.10.3/glade/Makefile.in	2008-03-04 19:27:33.000000000 +0100
@@ -255,7 +255,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/gtk/Makefile.in.old gtk-sharp-2.10.3/gtk/Makefile.in
--- gtk-sharp-2.10.3/gtk/Makefile.in.old	2008-03-04 19:28:23.000000000 +0100
+++ gtk-sharp-2.10.3/gtk/Makefile.in	2008-03-04 19:28:55.000000000 +0100
@@ -365,7 +365,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-recursive
diff -up gtk-sharp-2.10.3/atk/Makefile.in.old gtk-sharp-2.10.3/atk/Makefile.in
--- gtk-sharp-2.10.3/atk/Makefile.in.old	2008-03-04 19:24:11.000000000 +0100
+++ gtk-sharp-2.10.3/atk/Makefile.in	2008-03-04 19:25:47.000000000 +0100
@@ -230,7 +230,7 @@ build_symbols = $(addprefix --symbols=$(
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
-build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
+build_references = $(addprefix /r:, $(references)) -r:$(libdir)/mono/1.0/Mono.Cairo.dll
 @PLATFORM_WIN32_FALSE at GAPI_CDECL_INSERT = 
 @PLATFORM_WIN32_TRUE at GAPI_CDECL_INSERT = $(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
 all: all-am


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtk-sharp2.spec	28 Feb 2008 00:05:01 -0000	1.27
+++ gtk-sharp2.spec	4 Mar 2008 22:55:15 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.10.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@
 #Patch1: gtk-sharp-2.9.0-monodir.patch
 Patch2: gtk-sharp2-2.10.3-libdir.patch
 Patch3: gtk-sharp-2.8.2-docfix.patch
+Patch4: gtk-sharp2-2.10.3-assemblydir.patch
 
 BuildRequires:  mono-devel gtk2-devel libglade2-devel
 BuildRequires:  automake, libtool
@@ -61,13 +62,11 @@
 #%patch1 -p1 -b .monodir
 %patch2 -p1 -b .libdir
 %patch3 -p1 -b .docfix
+%patch4 -p1 -b .assemblydir
 
-#fix mono_dir
-sed -i 's|@prefix@/lib|%{_libdir}|g' parser/gapi2-parser.in parser/gapi2-fixup.in
 
 %build
-autoreconf --force --install
-
+#autoreconf --force --install
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make
@@ -76,6 +75,8 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
+
+#Remove libtool archive
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
 
 install -d $RPM_BUILD_ROOT%{_libdir}/monodoc/sources/
@@ -119,6 +120,9 @@
 %{_libdir}/monodoc
 
 %changelog
+* Mon Mar 03 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.10.3-2
+- Fixed Assembly_dir on Rawhide (bug #434286).
+
 * Wed Feb 27 2008 Xavier Lamien	<lxtnow[at]gmail.com> - 2.10.3-1
 - Updated Release.
 - Updated -libdir.patch against new release.

More information about the fedora-extras-commits mailing list