This patch incorporates a patch from Fedora which adds a MIME-type file
for the EZHex, EZTut, etc files.commit 5e804648c07d7177b44817c7bfcc37303bab10c3
Author: Scott Talbert <s...@techie.net>
Date: Sun Jun 16 15:07:47 2013 -0400
Incorporate MIME type patch from Fedora.
Signed-off-by: Scott Talbert <s...@techie.net>
diff --git a/libconcord/Makefile.am b/libconcord/Makefile.am
index 56d92dd..808484c 100644
--- a/libconcord/Makefile.am
+++ b/libconcord/Makefile.am
@@ -54,3 +54,25 @@ install_consolekit: consolekit install_udev_common
$(install_sh_DATA) libconcord.perms \
$(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
+# MIME stuff
+
+newmimedir = $(datadir)/mime/packages
+newmime_DATA = libconcord.xml
+
+EXTRA_DIST = \
+ $(mime_DATA) \
+ $(newmime_DATA)
+
+install-data-hook:
+if HAVE_NEW_MIME
+ if test -z "$(DESTDIR)"; then \
+ $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
+ fi
+endif
+
+uninstall-hook:
+if HAVE_NEW_MIME
+ if test -z "$(DESTDIR)"; then \
+ $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
+ fi
+endif
diff --git a/libconcord/configure.ac b/libconcord/configure.ac
index 47fc747..bd0477d 100644
--- a/libconcord/configure.ac
+++ b/libconcord/configure.ac
@@ -4,6 +4,23 @@ AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_LIBTOOL
AC_PROG_CXX
+#
+# allow the user to disable the mime database update
+#
+AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
+HAVE_NEW_MIME=no
+AC_ARG_ENABLE(mime-update,
+ AS_HELP_STRING([--disable-mime-update],
+ [Disable the MIME database update])],
+ [disable_mime=yes],
+ [disable_mime=no])
+if test "x$disable_mime" = "xno"; then
+ if test "x$UPDATE_MIME_DATABASE" != "xno"; then
+ HAVE_NEW_MIME=yes
+ AC_DEFINE(HAVE_NEW_MIME,1,[update mime database?])
+ fi
+fi
+AM_CONDITIONAL(HAVE_NEW_MIME, test x$HAVE_NEW_MIME = xyes)
a=1
AC_CHECK_HEADER(usb.h, [], [a=0])
AC_CHECK_LIB(usb, usb_init, [], [a=0])
diff --git a/libconcord/libconcord.xml b/libconcord/libconcord.xml
new file mode 100644
index 0000000..216360d
--- /dev/null
+++ b/libconcord/libconcord.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";>
+ <mime-type type="application/x-easyzapper-hex">
+ <comment>Logitech Harmony remote control update file (EZHex)</comment>
+ <glob pattern="*.EZHex"/>
+ </mime-type>
+ <mime-type type="application/x-easyzapper-upgrade">
+ <comment>Logitech Harmony remote control update file (EZUp)</comment>
+ <glob pattern="*.EZUp"/>
+ </mime-type>
+ <mime-type type="application/x-easyzapper-tutor">
+ <comment>Logitech Harmony remote control update file (EZTut)</comment>
+ <glob pattern="*.EZTut"/>
+ </mime-type>
+</mime-info>
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
concordance-devel mailing list
concordance-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/concordance-devel
