File mergeant-data.patch of Package mergeant
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</_comment>
+ <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,11 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
_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=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
