rpms/libconcord/devel libconcord-0.21-mime-type-def.patch, NONE, 1.1 libconcord.spec, 1.6, 1.7

[Douglas E. Warner]

Author: silfreed

Update of /cvs/pkgs/rpms/libconcord/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14009

Modified Files:
	libconcord.spec 
Added Files:
	libconcord-0.21-mime-type-def.patch 
Log Message:
* Wed Jun 17 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-3
- adding a mime-type definition so other packages can handle them appropriately
  (bug#506536)


libconcord-0.21-mime-type-def.patch:

--- NEW FILE libconcord-0.21-mime-type-def.patch ---
diff -urP concordance/libconcord/configure.ac concordance_new/libconcord/configure.ac
--- concordance/libconcord/configure.ac	2009-03-08 11:52:41.000000000 -0700
+++ concordance_new/libconcord/configure.ac	2009-06-17 10:44:32.546035768 -0700
@@ -2,6 +2,23 @@
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 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 -urP concordance/libconcord/libconcord.xml concordance_new/libconcord/libconcord.xml
--- concordance/libconcord/libconcord.xml	1969-12-31 16:00:00.000000000 -0800
+++ concordance_new/libconcord/libconcord.xml	2009-06-17 10:41:09.075036397 -0700
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-libconcord">
+     <comment>Logitech Harmony remote control update files, handled by libconcord</comment>
+     <magic priority="60">
+       <match type="string" value="entry" offset="0:50"/>
+     </magic>
+     <glob pattern="*.EZHex"/>
+     <glob pattern="*.EZUp"/>
+     <glob pattern="*.EZTut"/>
+   </mime-type>
+</mime-info>
diff -urP concordance/libconcord/Makefile.am concordance_new/libconcord/Makefile.am
--- concordance/libconcord/Makefile.am	2009-03-08 11:52:41.000000000 -0700
+++ concordance_new/libconcord/Makefile.am	2009-06-17 10:43:24.661036386 -0700
@@ -37,3 +37,25 @@
 	$(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


Index: libconcord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libconcord/devel/libconcord.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- libconcord.spec	17 Jun 2009 13:52:11 -0000	1.6
+++ libconcord.spec	17 Jun 2009 19:12:09 -0000	1.7
@@ -3,13 +3,14 @@
 
 Name: libconcord
 Version: 0.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Library to talk to Logitech Harmony universal remote controls
 
 Group: Development/Libraries
 License: GPLv3+
 URL: http://phildev.net/concordance/
 Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{mainpkg}-%{version}.tar.bz2
+Patch0: libconcord-0.21-mime-type-def.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libusb-devel
@@ -57,11 +58,12 @@ Python bindings for libconcord
 
 %prep
 %setup -q -n %{mainpkg}-%{version}
-
+%patch0 -p1
 
 %build
 cd %{name}
-%configure --disable-static
+autoreconf -i
+%configure --disable-static --disable-mime-update
 make %{_smp_mflags}
 make policykit
 
@@ -134,11 +136,13 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 /sbin/udevcontrol reload_rules
 touch /var/lib/misc/PolicyKit.reload
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
 /sbin/ldconfig
 /sbin/udevcontrol reload_rules
 touch /var/lib/misc/PolicyKit.reload
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %files
@@ -148,6 +152,7 @@ touch /var/lib/misc/PolicyKit.reload
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules
 %{_datadir}/hal/fdi/policy/10osvendor/*.fdi
 %{_datadir}/PolicyKit/policy/*.policy
+%{_datadir}/mime/packages/%{name}.xml
 %{_libdir}/*.so.*
 
 %files devel
@@ -169,6 +174,10 @@ touch /var/lib/misc/PolicyKit.reload
 
 
 %changelog
+* Wed Jun 17 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-3
+- adding a mime-type definition so other packages can handle them appropriately
+  (bug#506536)
+
 * Wed Jun 17 2009 Douglas E. Warner <silfreed at silfreed.net> 0.21-2
 - fixing name of hal policy to allow device to be accessed from non-root user
   properly (bug#506371)