Hello community,
here is the log from the commit of package mergeant
checked in at Thu Oct 18 16:58:49 CEST 2007.
--------
--- GNOME/mergeant/mergeant.changes 2007-10-11 16:39:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/mergeant/mergeant.changes 2007-10-18 16:26:55.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Oct 18 16:24:41 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 0.66:
+ * Adaptations to Libgda and Libgnomedb's API changes
+ * Better handling of transaction status when closing a workspace
+ * Tables contents are now displayed as a grid and as a form with
+ a toggle option
+ * Various other GUI improvements (Vivien)
+ * The SQL console is now accessible through the toolbar
+ * Modifications following Libgda/Libgnomedb changes
+ * Better GUI
+ * Added support for table creation, destruction and renaming, and
+ for column addition and removal
+ * Bug fixes
+ * Translations updates
+
+-------------------------------------------------------------------
Old:
----
mergeant-0.62.tar.bz2
mergeant-desktop.patch
New:
----
mergeant-0.66.tar.bz2
mergeant-data.patch
mergeant-implicit-declarations.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mergeant.spec ++++++
--- /var/tmp/diff_new_pack.Bd3062/_old 2007-10-18 16:58:39.000000000 +0200
+++ /var/tmp/diff_new_pack.Bd3062/_new 2007-10-18 16:58:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mergeant (Version 0.62)
+# spec file for package mergeant (Version 0.66)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,18 @@
# norootforbuild
Name: mergeant
-BuildRequires: docbook-toys docbook-xsl-stylesheets fdupes gcc-c++ gnutls-devel intltool libgnomedb-devel libgnomeprintui-devel libwnck-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files xmlcharent
+BuildRequires: docbook-toys docbook-xsl-stylesheets fdupes gcc-c++ gnutls-devel gtk-doc intltool libgnomedb-devel libgnomeprintui-devel libwnck-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files xmlcharent
License: GPL v2 or later
Group: Productivity/Databases/Tools
AutoReqProv: on
-Version: 0.62
-Release: 139
+Version: 0.66
+Release: 1
Summary: Mergeant--A Database Admin Tool (Development Version)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.gnome-db.org/
-Source: ftp://ftp.gnome.org/pub/gnome/sources/mergeant/0.61/%{name}-%{version}.tar.bz2
-Patch: %{name}-desktop.patch
+Source: ftp://ftp.gnome.org/pub/gnome/sources/mergeant/0.66/%{name}-%{version}.tar.bz2
+Patch: %{name}-data.patch
+Patch1: %{name}-implicit-declarations.patch
Requires: %{name}-lang = %{version}
%description
@@ -42,39 +43,28 @@
%prep
%setup -q
%patch
-rm po/no.*
-sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
+%patch1
+mv data/gnome-application-x-mergeant.png data/application-x-mergeant.png
+rm data/mergeant.applications data/mergeant.keys.in data/mergeant.keys data/mergeant.mime
%build
autoreconf -f -i
# FIXME: Build as root modifies system!
-# mergeant-0.62: --disable-scrollkeeper does not work properly.
+# mergeant-0.66: --disable-scrollkeeper does not work properly.
%configure\
+ --disable-update-mimedb\
--disable-scrollkeeper
make %{?jobs:-j%jobs}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime
-%suse_update_desktop_file %name System Database
-ln -s mergeant/mergeant.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mergeant.png
+%makeinstall
+%suse_update_desktop_file %{name}
%find_lang mergeant
-rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info $RPM_BUILD_ROOT%{_datadir}/application-registry
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-if test -x usr/bin/update-mime-database ; then
- usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
-
-%postun
-if test -x usr/bin/update-mime-database ; then
- usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
-
%files
%defattr(-, root, root)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
@@ -82,11 +72,27 @@
%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/*.xml
%{_datadir}/omf/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/mimetypes/*.*
+%{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/mergeant
%{_libdir}/bonobo/servers/GNOME_Mergeant.server
%files lang -f %{name}.lang
%changelog
+* Thu Oct 18 2007 - sbrabec@suse.cz
+- Updated to version 0.66:
+ * Adaptations to Libgda and Libgnomedb's API changes
+ * Better handling of transaction status when closing a workspace
+ * Tables contents are now displayed as a grid and as a form with
+ a toggle option
+ * Various other GUI improvements (Vivien)
+ * The SQL console is now accessible through the toolbar
+ * Modifications following Libgda/Libgnomedb changes
+ * Better GUI
+ * Added support for table creation, destruction and renaming, and
+ for column addition and removal
+ * Bug fixes
+ * Translations updates
* Thu Oct 11 2007 - sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Tue Aug 07 2007 - maw@suse.de
++++++ mergeant-0.62.tar.bz2 -> mergeant-0.66.tar.bz2 ++++++
++++ 77750 lines of diff (skipped)
++++++ mergeant-desktop.patch -> mergeant-data.patch ++++++
--- GNOME/mergeant/mergeant-desktop.patch 2005-06-29 15:37:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/mergeant/mergeant-data.patch 2007-10-18 16:24:22.000000000 +0200
@@ -1,14 +1,235 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=487916
+================================================================================
+--- Makefile.am
++++ Makefile.am
+@@ -28,20 +28,20 @@
+ intltool-update.in \
+ mkinstalldirs
+
+-pkgconfigdir=$(libdir)/pkgconfig
+-pkgconfig_DATA =
+-
+ # to include mergeant.spec in the distro
+ dist-hook: mergeant.spec
+ cp mergeant.spec $(distdir)
+
+-Pixmapdir=$(MERGEANT_Pixmapdir)
+-Pixmap_DATA=mergeant.png mergeant_tables.png mergeant_sequences.png mergeant_queries.png mergeant_foot.png \
++pixmapdir = $(datadir)/pixmaps
++pixmap_DATA = mergeant.png
++
++mergeant_pixmapdir = $(MERGEANT_Pixmapdir)
++mergeant_pixmap_DATA = mergeant_tables.png mergeant_sequences.png mergeant_queries.png mergeant_foot.png \
+ mergeant_connect.png mergeant_connect_small.png mergeant_disconnect.png mergeant_disconnect_small.png \
+ mergeant_rels.png mergeant_rels_small.png mergeant_forms.png query-view-table_16x16.png \
+ query-view-query_16x16.png query-view-view_16x16.png
+
+-Applicationsdir = $(datadir)/applications/
++Applicationsdir = $(datadir)/applications
+ Applications_in_files = mergeant.desktop.in
+ Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+@@ -51,3 +51,5 @@
+ intltool-extract \
+ intltool-merge \
+ intltool-update
++
++DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb
+--- configure.in
++++ configure.in
+@@ -50,6 +50,16 @@
+ fi
+
+ dnl
++dnl MIME database
++dnl
++AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
++AC_ARG_ENABLE(update-mimedb,
++ AC_HELP_STRING([--disable-update-mimedb],
++ [disable the update-mime-database after install [default=no]]),,
++ enable_update_mimedb=yes)
++AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
++
++dnl
+ dnl Scrollkeeper
+ dnl
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -1,20 +1,21 @@
+-keys_in_files = mergeant.keys.in
+-keys_files = $(keys_in_files:.keys.in=.keys)
+-@INTLTOOL_KEYS_RULE@
+-
+-mimedir = $(datadir)/mime-info
+-mime_DATA = $(keys_files) mergeant.mime
+-
+-applicationsdir = $(datadir)/application-registry
+-applications_DATA = mergeant.applications
+-
+-mimeiconsdir = $(datadir)/pixmaps/document-icons
+-mimeicons_DATA = gnome-application-x-mergeant.png
+-
+-EXTRA_DIST = \
+- $(keys_in_files) \
+- $(mime_DATA) \
+- $(mimeicons_DATA) \
+- $(applications_DATA)
++@INTLTOOL_XML_RULE@
+
+-DISTCLEANFILES = mergeant.keys
++packagesdir = $(datadir)/mime/packages
++packages_DATA = mergeant.xml
++
++mimeiconsdir = $(datadir)/icons/hicolor/48x48/mimetypes
++mimeicons_DATA = application-x-mergeant.png
++
++install-data-hook:
++if ENABLE_UPDATE_MIMEDB
++ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
++endif
++
++uninstall-hook:
++if ENABLE_UPDATE_MIMEDB
++ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
++endif
++
++DISTCLEANFILES = mergeant.xml
++
++EXTRA_DIST = mergeant.xml.in $(mimeicons_DATA)
+--- data/mergeant.xml.in
++++ data/mergeant.xml.in
+@@ -0,0 +1,7 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
++ <mime-type type="application/x-mergeant">
++ <_comment>Mergeant database file
++ <glob pattern="*.mergeant" />
++ </mime-type>
++</mime-info>
+--- doc/C/Makefile.am
++++ doc/C/Makefile.am
+@@ -27,7 +27,7 @@
+ fi)
+
+
+-install-data-local: mergeant
++install-data-local: mergeant
+ ${mkinstalldirs} $(DESTDIR)${Mergeant_Lang_helpdir}/images
+ ${mkinstalldirs} $(DESTDIR)${Mergeant_Lang_helpdir}/stylesheet-images
+ -for file in ${srcdir}/mergeant/*.html ${srcdir}/mergeant/*.css; do \
+@@ -44,7 +44,7 @@
+ done
+
+ uninstall:
+- -rm -rf ${Mergeant_Lang_helpdir}
++ -rm -rf $(DESTDIR)${Mergeant_Lang_helpdir}
+
+ mergeant.ps: mergeant.xml
+ -db2ps $<
--- mergeant.desktop.in
+++ mergeant.desktop.in
-@@ -1,9 +1,9 @@
+@@ -1,11 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
--_Name=Mergeant Database Administration
-+_GenericName=Mergeant Database Administration
+ _Name=Mergeant Database Administration
++_GenericName=Database Administration
_Comment=Maintain and query a SQL database
Exec=mergeant
-Icon=mergeant/mergeant.png
+Icon=mergeant
Terminal=false
Type=Application
- Categories=Application;Office;
+-Categories=Application;Office;
++Categories=Office;Database;
+ StartupNotify=true
+ MimeType=application/x-mergeant;
+--- mergeant.spec.in
++++ mergeant.spec.in
+@@ -15,7 +15,7 @@
+ %setup
+
+ %build
+-%configure
++%configure --disable-update-mimedb
+ make
+
+ %install
+@@ -28,23 +28,25 @@
+
+ %post
+ if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
++if which update-mime-database >/dev/null 2>&1; update-mime-database "%{_datadir}/mime" ; fi
+
+ %postun
+ if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
++if which update-mime-database >/dev/null 2>&1; update-mime-database "%{_datadir}/mime" ; fi
+
+ %files -f %{name}.lang
+ %defattr(-, root, root)
+ %doc AUTHORS examples COPYING ChangeLog NEWS README TODO
+ %{_bindir}/*
+-%{_datadir}/pixmaps/document-icons/*
+ %{_datadir}/pixmaps/mergeant
+-%{_datadir}/application-registry/*
++%{_datadir}/pixmaps/*.png
+ %{_datadir}/applications/*
+ %{_datadir}/gnome/help/mergeant
++%{_datadir}/icons/hicolor/48x48/mimetypes/*
+ %{_datadir}/mergeant
++%{_datadir}/mime/packages/*
+ %{_libdir}/mergeant/plugins
+ %{_libdir}/mergeant/plugins/*
+-%{_datadir}/mime-info/*
+ %{_datadir}/omf/*
+
+ %changelog
+--- mergeant.spec_mdk.in
++++ mergeant.spec_mdk.in
+@@ -37,7 +37,7 @@
+
+ %build
+
+-CFLAGS="$RPM_OPT_FLAGS" ./configure $ARCH_FLAGS --prefix=%{prefix} --sysconfdir=%{sysconfdir}
++CFLAGS="$RPM_OPT_FLAGS" ./configure $ARCH_FLAGS --prefix=%{prefix} --sysconfdir=%{sysconfdir} --disable-update-mimedb
+
+ if [ "$SMP" != "" ]; then
+ (make "MAKE=make -k -j $SMP"; exit 0)
+@@ -73,9 +73,11 @@
+
+ %post
+ %{update_menus}
++if which update-mime-database >/dev/null 2>&1; update-mime-database "%{_datadir}/mime" ; fi
+
+ %postun
+ %{clean_menus}
++if which update-mime-database >/dev/null 2>&1; update-mime-database "%{_datadir}/mime" ; fi
+
+ %files
+ %defattr(-, root, root)
+@@ -84,12 +86,15 @@
+ %doc examples/
+ %{prefix}/bin/mergeant
+ %{prefix}/share/pixmaps/mergeant/*
++%{prefix}/share/pixmaps/*.png
+ %{prefix}/share/locale/*
+ %{prefix}/share/applications/mergeant.desktop
+ %{prefix}/share/gnome/help/mergeant/C/*
+ %{prefix}/share/gnome/help/mergeant/fr/*
++%{prefix}/share/icons/hicolor/48x48/mimetypes/*
+ %{prefix}/share/mergeant/plugins/*
+ %{prefix}/share/mergeant/dtd/*
++%{prefix}/share/mime/packages/*
+
+ %{_menudir}/*
+ %{_iconsdir}/*.xpm
+--- po/POTFILES.in
++++ po/POTFILES.in
+@@ -1,6 +1,6 @@
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+-data/mergeant.keys.in
++data/mergeant.xml.in
+ mergeant.desktop.in
+ src/GNOME_Mergeant.server.in.in
+ src/main.c
++++++ mergeant-implicit-declarations.patch ++++++
http://bugzilla.gnome.org/show_bug.cgi?id=487916
query-druid.c: In function 'finish_page_cb':
query-druid.c:1385: warning: implicit declaration of function 'gda_graphs_get_graph_for_object'
query-druid.c:1385: warning: assignment makes pointer from integer without a cast
query-editor.c: In function 'query_editor_initialize':
query-editor.c:339: warning: implicit declaration of function 'gda_graphs_get_graph_for_object'
query-editor.c:340: warning: assignment makes pointer from integer without a cast
workspace-window.c: In function 'on_sql_console':
workspace-window.c:357: warning: implicit declaration of function 'gnome_db_sql_console_new'
workspace-window.c:357: warning: assignment makes pointer from integer without a cast
================================================================================
--- src/query-druid.c
+++ src/query-druid.c
@@ -22,6 +22,7 @@
#include