Hello community, here is the log from the commit of package gtk-sharp2 checked in at Thu Mar 29 00:41:06 CEST 2007. -------- --- GNOME/gtk-sharp2/gtk-sharp2.changes 2007-01-17 15:45:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk-sharp2/gtk-sharp2.changes 2007-03-27 14:51:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 27 14:51:38 CEST 2007 - sbrabec@suse.cz + +- Build with the latest gtkhtml. + +------------------------------------------------------------------- Old: ---- gtk-sharp-2.8.3.tar.gz New: ---- gtk-sharp-2.8.3.tar.bz2 gtk-sharp-gtkhtml-2_14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.W14938/_old 2007-03-29 00:40:49.000000000 +0200 +++ /var/tmp/diff_new_pack.W14938/_new 2007-03-29 00:40:49.000000000 +0200 @@ -11,22 +11,21 @@ # norootforbuild Name: gtk-sharp2 +%define _name gtk-sharp BuildRequires: gnome-panel-devel gtkhtml2-devel librsvg-devel mono-devel monodoc-core update-desktop-files vte-devel %ifarch ppc64 BuildRequires: mono-biarchcompat %endif URL: http://gtk-sharp.sf.net -%define prefix /usr -%define sysconfdir /etc License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/GNOME -Autoreqprov: on Version: 2.8.3 -Release: 44 +Release: 52 Summary: .Net Language Bindings for GTK+ -Source: gtk-sharp-%{version}.tar.gz +Source: %{_name}-%{version}.tar.bz2 Patch: gtk-sharp-makefile.patch Patch1: gtk-sharp-optflags.patch +Patch2: gtk-sharp-gtkhtml-2_14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -145,18 +144,18 @@ %package -n gtk-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: glade-sharp2 = %version-%release -Requires: glib-sharp2 = %version-%release -Requires: gnome-sharp2 = %version-%release -Requires: gnome-vfs-sharp2 = %version-%release -Requires: gtk-sharp2 = %version-%release -Requires: gtk-sharp2-doc = %version-%release -Requires: gtk-sharp2-gapi = %version-%release -Requires: gtkhtml-sharp2 = %version-%release -Requires: rsvg-sharp2 = %version-%release -Requires: vte-sharp2 = %version-%release +Requires: art-sharp2 = %{version}-%{release} +Requires: gconf-sharp2 = %{version}-%{release} +Requires: glade-sharp2 = %{version}-%{release} +Requires: glib-sharp2 = %{version}-%{release} +Requires: gnome-sharp2 = %{version}-%{release} +Requires: gnome-vfs-sharp2 = %{version}-%{release} +Requires: gtk-sharp2 = %{version}-%{release} +Requires: gtk-sharp2-doc = %{version}-%{release} +Requires: gtk-sharp2-gapi = %{version}-%{release} +Requires: gtkhtml-sharp2 = %{version}-%{release} +Requires: rsvg-sharp2 = %{version}-%{release} +Requires: vte-sharp2 = %{version}-%{release} %description -n gtk-sharp2-complete Gtk# is a library that allows you to build fully native graphical GNOME @@ -168,132 +167,136 @@ %prep -%setup -q -n gtk-sharp-%{version} +%setup -q -n %{_name}-%{version} %patch0 -p0 %patch1 -p1 +%patch2 %build -autoreconf -fi -CFLAGS="$RPM_OPT_FLAGS" -%configure --libexecdir=%{prefix}/lib \ +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 -#make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir /usr/lib /root ${RPM_BUILD_ROOT}/usr/lib" -make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/usr/%{_lib}/*.*a +%makeinstall +rm $RPM_BUILD_ROOT%{_libdir}/*.*a %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%{prefix}/lib/mono/gac/*atk-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*atk-sharp.dll -%{prefix}/lib/mono/gac/*gdk-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*gdk-sharp.dll -%{prefix}/lib/mono/gac/*gtk-dotnet -%{prefix}/lib/mono/gtk-sharp-2.0/*gtk-dotnet.dll -%{prefix}/lib/mono/gac/*gtk-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*gtk-sharp.dll -%{prefix}/lib/mono/gac/*pango-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*pango-sharp.dll -%{prefix}/%{_lib}/libgdksharpglue-2.so -%{prefix}/%{_lib}/libgtksharpglue-2.so -%{prefix}/%{_lib}/libpangosharpglue-2.so -%{prefix}/%{_lib}/pkgconfig/gtk-sharp-2.0.pc -%{prefix}/%{_lib}/pkgconfig/gtk-dotnet-2.0.pc +%{_libdir}/libgdksharpglue-2.so +%{_libdir}/libgtksharpglue-2.so +%{_libdir}/libpangosharpglue-2.so +%{_libdir}/pkgconfig/gtk-sharp-2.0.pc +%{_libdir}/pkgconfig/gtk-dotnet-2.0.pc +%{_prefix}/lib/mono/gac/*atk-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*atk-sharp.dll +%{_prefix}/lib/mono/gac/*gdk-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*gdk-sharp.dll +%{_prefix}/lib/mono/gac/*gtk-dotnet +%{_prefix}/lib/mono/gtk-sharp-2.0/*gtk-dotnet.dll +%{_prefix}/lib/mono/gac/*gtk-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*gtk-sharp.dll +%{_prefix}/lib/mono/gac/*pango-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*pango-sharp.dll %files gapi %defattr(-, root, root) -%{prefix}/bin/gapi2-codegen -%{prefix}/bin/gapi2-fixup -%{prefix}/bin/gapi2-parser -%{prefix}/lib/gtk-sharp-2.0/gapi_codegen.exe -%{prefix}/lib/gtk-sharp-2.0/gapi-fixup.exe -%{prefix}/lib/gtk-sharp-2.0/gapi-parser.exe -%{prefix}/lib/gtk-sharp-2.0/gapi_pp.pl -%{prefix}/lib/gtk-sharp-2.0/gapi2xml.pl -%{prefix}/%{_lib}/pkgconfig/gapi-2.0.pc -%{prefix}/share/gapi-2.0 +%{_bindir}/gapi2-codegen +%{_bindir}/gapi2-fixup +%{_bindir}/gapi2-parser +%{_datadir}/gapi-2.0 +%{_libdir}/pkgconfig/gapi-2.0.pc +%{_prefix}/lib/gtk-sharp-2.0/gapi_codegen.exe +%{_prefix}/lib/gtk-sharp-2.0/gapi-fixup.exe +%{_prefix}/lib/gtk-sharp-2.0/gapi-parser.exe +%{_prefix}/lib/gtk-sharp-2.0/gapi_pp.pl +%{_prefix}/lib/gtk-sharp-2.0/gapi2xml.pl %files -n gnome-sharp2 %defattr(-,root,root) -%{prefix}/lib/mono/gac/*gnome-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*gnome-sharp.dll -%{prefix}/%{_lib}/libgnomesharpglue-2.so -%{prefix}/%{_lib}/pkgconfig/gnome-sharp-2.0.pc +%{_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 %files -n rsvg-sharp2 %defattr(-,root,root) -%{prefix}/lib/mono/gac/*rsvg-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*rsvg-sharp.dll -%{prefix}/%{_lib}/pkgconfig/rsvg-sharp-2.0.pc +%{_libdir}/pkgconfig/rsvg-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*rsvg-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*rsvg-sharp.dll %files -n gtkhtml-sharp2 %defattr(-,root,root) -%{prefix}/lib/mono/gac/*gtkhtml-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*gtkhtml-sharp.dll -%{prefix}/%{_lib}/pkgconfig/gtkhtml-sharp-2.0.pc +%{_libdir}/pkgconfig/gtkhtml-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*gtkhtml-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*gtkhtml-sharp.dll %files -n gnome-vfs-sharp2 %defattr(-,root,root) -%{prefix}/lib/mono/gac/*gnome-vfs-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*gnome-vfs-sharp.dll -%{prefix}/%{_lib}/pkgconfig/gnome-vfs-sharp-2.0.pc +%{_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 %files -n art-sharp2 %defattr(-,root,root) -%{prefix}/lib/mono/gac/*art-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*art-sharp.dll -%{prefix}/%{_lib}/pkgconfig/art-sharp-2.0.pc +%{_libdir}/pkgconfig/art-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*art-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*art-sharp.dll %files -n gtk-sharp2-doc %defattr(-, root, root) %doc COPYING ChangeLog README -%{prefix}/lib/monodoc +%{_prefix}/lib/monodoc %files -n glib-sharp2 %defattr(-, root, root) -%{prefix}/lib/mono/gac/*glib-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*glib-sharp.dll -%{prefix}/%{_lib}/libglibsharpglue-2.so -%{prefix}/%{_lib}/pkgconfig/glib-sharp-2.0.pc +%{_libdir}/libglibsharpglue-2.so +%{_libdir}/pkgconfig/glib-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*glib-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*glib-sharp.dll %files -n glade-sharp2 %defattr(-, root, root) -%{prefix}/lib/mono/gac/*glade-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*glade-sharp.dll -%{prefix}/%{_lib}/libgladesharpglue-2.so -%{prefix}/%{_lib}/pkgconfig/glade-sharp-2.0.pc +%{_libdir}/libgladesharpglue-2.so +%{_libdir}/pkgconfig/glade-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*glade-sharp +%{_prefix}/lib/mono/gtk-sharp-2.0/*glade-sharp.dll %files -n vte-sharp2 %defattr(-, root, root) -%{prefix}/lib/mono/gac/*vte-sharp -%{prefix}/lib/mono/gtk-sharp-2.0/*vte-sharp.dll -%{prefix}/%{_lib}/libvtesharpglue-2.so -%{prefix}/%{_lib}/pkgconfig/vte-sharp-2.0.pc +%{_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 %files -n gconf-sharp2 %defattr(-, root, root) -%{prefix}/bin/gconfsharp2-schemagen -%{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 +%{_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 -%{prefix}/%{_lib}/pkgconfig/gconf-sharp-2.0.pc +%{_prefix}/lib/mono/gac/*gconf-sharp-peditors +%{_prefix}/lib/mono/gtk-sharp-2.0/*gconf-sharp-peditors.dll %files -n gtk-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 +%dir %{_prefix}/lib/mono/gtk-sharp-2.0 +%dir %{_prefix}/lib/gtk-sharp-2.0 -%changelog -n gtk-sharp2 +%changelog +* Tue Mar 27 2007 - sbrabec@suse.cz +- Build with the latest gtkhtml. * Wed Jan 17 2007 - meissner@suse.de - use RPM_OPT_FLAGS. * Fri Oct 20 2006 - ro@suse.de ++++++ gtk-sharp-gtkhtml-2_14.patch ++++++ --- configure.in +++ configure.in @@ -198,6 +198,12 @@ 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.13.0 +PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.14 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) +if test "x$enable_gtkhtml" = "xyes"; then +GTKHTML_VERSION=3.14 +GTKHTML_SOVERSION=3.14 +else 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 @@ -228,6 +234,7 @@ fi fi fi +fi AC_SUBST(GTKHTML_VERSION) AC_SUBST(GTKHTML_SOVERSION) else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org