Hello community, here is the log from the commit of package gnome-sharp2 checked in at Wed Jul 11 11:03:05 CEST 2007. -------- New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-sharp2/gnome-sharp2.changes 2007-07-09 20:50:08.780452000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Sat Jul 03 18:25:27 MST 2007 - wberrier@suse.de + +- Initial package of gnome-sharp2 2.16.0 + -(Split from gtk-sharp 2.8.3) + New: ---- gnome-sharp-2.16.0.tar.gz gnome-sharp2.changes gnome-sharp2.spec gnome-sharp-find_gtkhtml_ver.patch gnome-sharp-makefile.patch gnome-sharp-optflags.patch gnome-sharp-revert_unportable_relocatable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-sharp2.spec ++++++ # # spec file for package gnome-sharp2 (Version 2.16.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: gnome-sharp2 Version: 2.16.0 Release: 1 %define _name gnome-sharp %ifarch ppc64 BuildRequires: mono-biarchcompat %endif Url: http://gtk-sharp.sf.net License: GPL v2 or later, LGPL v2 or later Group: System/GUI/GNOME Summary: Mono 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: glade-sharp2 gtk-sharp2 gtk-sharp2-gapi ##### suse #### %if 0%{?suse_version} # Not needed with rpm .config dep search #%define gtkhtml_requires gtkhtml2 %define new_suse_buildrequires libgnomedb-devel librsvg-devel mono-devel vte-devel gnome-panel-devel monodoc-core update-desktop-files BuildRequires: %{new_suse_buildrequires} gtkhtml2-devel %endif ################# #### fedora #### %if 0%{?fedora_version} %define env_options export MONO_SHARED_DIR=/tmp # All fedora distros (5 and 6) have the same names, requirements BuildRequires: gnome-panel-devel gtkhtml3-devel libgnomedb-devel libgnomeprintui22-devel librsvg2-devel mono-devel monodoc-core vte-devel # Not needed with rpm .config dep search #%define gtkhtml_requires gtkhtml2 %endif ################# %description This package contains Mono bindings for Gnome. %package -n gnome-sharp2-complete Group: System/GUI/GNOME Summary: GTK+ and GNOME bindings for Mono (virtual package) Requires: art-sharp2 = %{version}-%{release} Requires: gconf-sharp2 = %{version}-%{release} Requires: gnome-sharp2 = %{version}-%{release} Requires: gnome-vfs-sharp2 = %{version}-%{release} Requires: gtkhtml-sharp2 = %{version}-%{release} Requires: rsvg-sharp2 = %{version}-%{release} Requires: vte-sharp2 = %{version}-%{release} %description -n gnome-sharp2-complete Gtk# is a library that allows you to build fully native graphical GNOME applications using Mono. Gtk# is a binding to GTK+, the cross platform user interface toolkit used in GNOME. It includes bindings for Gtk, Atk, Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. (Virtual package which depends on all gtk-sharp2 subpackages) %package -n rsvg-sharp2 Summary: Mono bindings for rsvg Group: System/GUI/GNOME # Not needed with rpm .config dep search #Requires: librsvg %description -n rsvg-sharp2 This package contains Mono bindings for librsvg. %package -n gtkhtml-sharp2 Summary: Mono bindings for gtkhtml Group: System/GUI/GNOME # Not needed with rpm .config dep search #Requires: %gtkhtml_requires %description -n gtkhtml-sharp2 This package contains Mono bindings for gtkhtml. %package -n gnome-vfs-sharp2 Summary: Mono bindings for gnomevfs Group: System/GUI/GNOME # Not needed with rpm .config dep search #Requires: gnome-vfs2 %description -n gnome-vfs-sharp2 This package contains Mono bindings gnomevfs. %package -n art-sharp2 Summary: Mono bindings for libart Group: System/GUI/GNOME # Not needed with rpm .config dep search #Requires: libart_lgpl %description -n art-sharp2 This package contains Mono bindings for libart. %package -n vte-sharp2 Group: System/GUI/GNOME Summary: Mono bindings for vte # Not needed with rpm .config dep search #Requires: vte %description -n vte-sharp2 This package contains Mono bindings for vte. %package -n gconf-sharp2 Summary: Mono bindings for gconf Group: System/GUI/GNOME %description -n gconf-sharp2 This package contains Mono bindings for gconf and gconf peditors. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 %patch1 -p0 %patch2 %patch3 -p1 %build %{?env_options} autoreconf -f -i # FIXME: windowmanager.c:*: warning: dereferencing type-punned pointer will break strict-aliasing rules export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --libexecdir=%{_prefix}/lib\ --enable-debug make %install %{?env_options} %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.*a %clean rm -rf $RPM_BUILD_ROOT %files -n gnome-sharp2-complete %defattr(-, root, root) ## This is the 'base' package so we put the common dirs of all in this package # Otherwise, this package doesn't get created! %dir %{_prefix}/lib/mono/gtk-sharp-2.0 %dir %{_prefix}/lib/gtk-sharp-2.0 %files -n gnome-sharp2 %defattr(-,root,root) %{_libdir}/libgnomesharpglue-2.so %{_libdir}/pkgconfig/gnome-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gnome-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-sharp.dll %{_prefix}/share/gapi-2.0/gnome-api.xml %files -n rsvg-sharp2 %defattr(-,root,root) %{_libdir}/pkgconfig/rsvg-sharp-2.0.pc %{_prefix}/lib/mono/gac/*rsvg-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*rsvg-sharp.dll %{_prefix}/share/gapi-2.0/rsvg-api.xml %files -n gtkhtml-sharp2 %defattr(-,root,root) %{_libdir}/pkgconfig/gtkhtml-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gtkhtml-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gtkhtml-sharp.dll %{_prefix}/share/gapi-2.0/gtkhtml-api.xml %files -n gnome-vfs-sharp2 %defattr(-,root,root) %{_libdir}/pkgconfig/gnome-vfs-sharp-2.0.pc %{_prefix}/lib/mono/gac/*gnome-vfs-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gnome-vfs-sharp.dll %{_prefix}/share/gapi-2.0/gnome-vfs-api.xml %files -n art-sharp2 %defattr(-,root,root) %{_libdir}/pkgconfig/art-sharp-2.0.pc %{_prefix}/lib/mono/gac/*art-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*art-sharp.dll %{_prefix}/share/gapi-2.0/art-api.xml %files -n vte-sharp2 %defattr(-, root, root) %{_libdir}/libvtesharpglue-2.so %{_libdir}/pkgconfig/vte-sharp-2.0.pc %{_prefix}/lib/mono/gac/*vte-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*vte-sharp.dll %{_prefix}/share/gapi-2.0/vte-api.xml %files -n gconf-sharp2 %defattr(-, root, root) %{_bindir}/gconfsharp2-schemagen %{_libdir}/pkgconfig/gconf-sharp-2.0.pc %{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe %{_prefix}/lib/mono/gac/*gconf-sharp %{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp.dll # Other distros place these in gnome-sharp2?? %{_prefix}/lib/mono/gac/*gconf-sharp-peditors %{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp-peditors.dll %if 0%{?suse_version} <= 1040 || 0%{?fedora_version} <= 7 %if 0%{?fedora_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif # auto dep/req generation for older distros (it will take a while for the .config scanning to get upstream) %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %endif %changelog * Tue Jul 03 2007 - wberrier@suse.de - Initial package of gnome-sharp2 2.16.0 -(Split from gtk-sharp 2.8.3) ++++++ gnome-sharp-find_gtkhtml_ver.patch ++++++ 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 @@ -114,9 +114,11 @@ if test `uname -s` = "Darwin"; then LIB_PREFIX= LIB_SUFFIX=.dylib + GTKHTML_SORT_FLAGS=-r else LIB_PREFIX=.so LIB_SUFFIX= + GTKHTML_SORT_FLAGS= fi SDCHECK="`$GACUTIL /l |grep ^System.Drawing, | head -n1 |cut -f1 -d','`" if test "x$SDCHECK" = "xSystem.Drawing"; then @@ -198,38 +200,26 @@ PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no) if test "x$enable_gnome" = "xyes"; then -GTKHTML_REQUIRED_VERSION=3.8.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.8 -GTKHTML_SOVERSION=15 -else -GTKHTML_REQUIRED_VERSION=3.6.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.6 -GTKHTML_SOVERSION=18 -else -GTKHTML_REQUIRED_VERSION=3.2.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.1 -GTKHTML_SOVERSION=11 -else -GTKHTML_REQUIRED_VERSION=3.0.10 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) +GTKHTML_BASEFILE= + +i=0 +while [[ $i -lt 100 ]] ; do +PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.$i, enable_gtkhtml=yes, enable_gtkhtml=no) if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.0 -GTKHTML_SOVERSION=4 +echo "Found libgtkhtml-3.$i" +GTKHTML_VERSION=3.$i +GTKHTML_LIBDIR=`$PKG_CONFIG --variable libdir libgtkhtml-3.$i` +GTKHTML_FULLFILE=`ls $GTKHTML_LIBDIR/libgtkhtml-$GTKHTML_VERSION$LIB_PREFIX.*$LIB_SUFFIX | sort $GTKHTML_SORT_FLAGS | head -n1` +GTKHTML_BASEFILE=`basename $GTKHTML_FULLFILE` +echo "Found versioned file: $GTKHTML_BASEFILE" +break else -GTKHTML_VERSION= -GTKHTML_SOVERSION= -fi -fi +echo "$i" fi -fi -AC_SUBST(GTKHTML_VERSION) -AC_SUBST(GTKHTML_SOVERSION) +i=$(($i+1)) +done + +AC_SUBST(GTKHTML_BASEFILE) 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 @@ -1,4 +1,4 @@ <configuration> <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> - <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/> + <dllmap dll="gtkhtml-3.0" target="@GTKHTML_BASEFILE@"/> </configuration> ++++++ gnome-sharp-makefile.patch ++++++ --- sample/gconf/Makefile.am +++ 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 ++++++ gnome-sharp-optflags.patch ++++++ --- 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' ++++++ gnome-sharp-revert_unportable_relocatable.patch ++++++ 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"` - -@RUNTIME@ $d/../lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" +@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org