Hello community, here is the log from the commit of package gecko-sharp2 checked in at Tue Dec 12 02:29:48 CET 2006. -------- --- GNOME/gecko-sharp2/gecko-sharp2.changes 2006-11-30 19:37:28.000000000 +0100 +++ /mounts/work_src_done/NOARCH/gecko-sharp2/gecko-sharp2.changes 2006-12-12 00:25:56.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Dec 12 00:13:04 CET 2006 - wberrier@suse.de + +- Undo gecko-sharp2 doc package split. + -gecko-sharp2-r69353_break_cyclic_dep.patch: Patch to depend on + monodoc-core instead of mono-tools to break cyclic dep + -gecko-sharp2-r69372_fix_autoconf_docdir.patch: now that we use + autoreconf for the above patch, we must rename docdir to + monodocdir so docdir doesn't get overwritten + +------------------------------------------------------------------- Old: ---- gecko-sharp2-docs.changes gecko-sharp2-docs.spec New: ---- gecko-sharp2-r69353_break_cyclic_dep.patch gecko-sharp2-r69372_fix_autoconf_docdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gecko-sharp2.spec ++++++ --- /var/tmp/diff_new_pack.sRXhki/_old 2006-12-12 02:29:17.000000000 +0100 +++ /var/tmp/diff_new_pack.sRXhki/_new 2006-12-12 02:29:17.000000000 +0100 @@ -12,13 +12,15 @@ Name: gecko-sharp2 %define xulrunner_version 181 -BuildRequires: glib-sharp2 gtk-sharp2 gtk-sharp2-gapi gtk2-devel mono-devel +BuildRequires: glib-sharp2 gtk-sharp2 gtk-sharp2-gapi gtk2-devel mono-devel monodoc-core Version: 0.11 -Release: 56 +Release: 57 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), MOZILLA PUBLIC LICENSE (MPL/NPL) BuildArch: noarch URL: www.monodevelop.com Source0: gecko-sharp-2.0-%{version}.tar.gz +Patch0: gecko-sharp2-r69353_break_cyclic_dep.patch +Patch1: gecko-sharp2-r69372_fix_autoconf_docdir.patch Summary: Gecko bindings for Mono Group: Development/Libraries/Other %if %suse_version > 1010 || 0%{?opensuse_bs} @@ -60,8 +62,11 @@ %prep %setup -q -n gecko-sharp-2.0-%{version} +%patch0 +%patch1 %build +autoreconf -fi ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var %install @@ -77,8 +82,16 @@ /usr/lib/mono/gecko-sharp-2.0 /usr/lib/mono/gac/gecko-sharp /usr/share/pkgconfig/*.pc +/usr/lib/monodoc/sources/* %changelog -n gecko-sharp2 +* Tue Dec 12 2006 - wberrier@suse.de +- Undo gecko-sharp2 doc package split. + -gecko-sharp2-r69353_break_cyclic_dep.patch: Patch to depend on + monodoc-core instead of mono-tools to break cyclic dep + -gecko-sharp2-r69372_fix_autoconf_docdir.patch: now that we use + autoreconf for the above patch, we must rename docdir to + monodocdir so docdir doesn't get overwritten * Thu Nov 30 2006 - sbrabec@suse.cz - Fixed xulrunner dependencies for older products. * Tue Nov 14 2006 - ro@suse.de ++++++ gecko-sharp2-r69353_break_cyclic_dep.patch ++++++ Index: configure.in =================================================================== --- configure.in (revision 69351) +++ configure.in (working copy) @@ -108,15 +108,15 @@ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no) if test "x$enable_monodoc" = "xyes"; then - AC_PATH_PROG(MONODOC, monodoc, no) - if test x$MONODOC = xno; then + AC_PATH_PROG(MONODOCER, monodocer, no) + if test x$MONODOCER = xno; then enable_monodoc=no fi else - MONODOC= + MONODOCER= fi -AC_SUBST(MONODOC) +AC_SUBST(MONODOCER) AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") @@ -154,7 +154,7 @@ echo "" echo " * Installation prefix: $prefix" echo " * compiler: $CSC" -echo " * Documentation: $enable_monodoc ($MONODOC)" +echo " * Documentation: $enable_monodoc ($MONODOCER)" echo "" echo "---" Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 69352) +++ doc/Makefile.am (working copy) @@ -7,13 +7,13 @@ noinst_DATA = $(TARGETS) ASSEMBLER = mdassembler -UPDATER = $(MONODOC) --update gecko-sharp-docs.zip gecko-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml $(ASSEMBLER) --ecma $(srcdir)/en -o gecko-sharp-docs update: - $(UPDATER) ../gtkmozembed-sharp/gecko-sharp.dll -o ./en -f + rm -Rf ./en/Gecko/* ./en/GtkSharp.GeckoSharp/* + $(MONODOCER) -updateto:./en -path:. -assembly:../gtkmozembed/gecko-sharp.dll CLEANFILES = gecko-sharp-docs.zip gecko-sharp-docs.tree ++++++ gecko-sharp2-r69372_fix_autoconf_docdir.patch ++++++ diff -ur ./doc/Makefile.am ../new/gecko-sharp-2.0-0.11/doc/Makefile.am --- ./doc/Makefile.am 2005-09-09 06:11:51.000000000 +0200 +++ ../new/gecko-sharp-2.0-0.11/doc/Makefile.am 2006-12-12 00:03:59.000000000 +0100 @@ -1,6 +1,6 @@ if ENABLE_MONODOC -docdir = $(prefix)/lib/monodoc/sources -doc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source +monodocdir = $(prefix)/lib/monodoc/sources +monodoc_DATA = gecko-sharp-docs.zip gecko-sharp-docs.tree gecko-sharp-docs.source endif noinst_DATA = $(TARGETS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org