From c8fe1486842c8ccd6eead863bc8b674bb93b18c5 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Sun, 18 May 2008 16:17:11 +0000
Subject: [PATCH] Upgrade to 20080429 Add mime info for .sfd files. Fixes
 240669

---
 .cvsignore     |  4 ++--
 fontforge.spec | 26 ++++++++++++++++++++++----
 fontforge.xml  | 11 +++++++++++
 sources        |  4 ++--
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 fontforge.xml

diff --git a/.cvsignore b/.cvsignore
index 21c2fcb..3e8c1c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fontforge_full-20080309.tar.bz2
-fontforge_htdocs-20080302.tar.bz2
+fontforge_full-20080429.tar.bz2
+fontforge_htdocs-20080429.tar.bz2
diff --git a/fontforge.spec b/fontforge.spec
index 5d2cafd..072c3cd 100644
--- a/fontforge.spec
+++ b/fontforge.spec
@@ -1,8 +1,8 @@
-%define docs_version 20080302
+%define docs_version 20080429
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20080309
+Version:        20080429
 Release:        1%{?dist}
 Summary:        Outline and bitmap font editor
 
@@ -12,6 +12,7 @@ URL:            http://fontforge.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/fontforge/fontforge_full-%{version}.tar.bz2
 Source1:        fontforge.desktop
 Source2:        http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{docs_version}.tar.bz2
+Source3:	fontforge.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       xdg-utils
@@ -100,13 +101,23 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 # Find translations
 %find_lang %{gettext_package}
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
+
+install -p %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+/sbin/ldconfig
 
 
 %files -f %{gettext_package}.lang
@@ -118,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/fontforge
 %{_datadir}/pixmaps/fontforge.png
 %{_mandir}/man1/*.1*
+%{_datadir}/mime/packages/fontforge.xml
 
 %files devel
 %defattr(-,root,root,-)
@@ -126,6 +138,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri May 16 2008 Kevin Fenzi <kevin@tummy.com> - 20080429-1
+- Upgrade to 20080429
+
+* Mon Mar 24 2008 Kevin Fenzi <kevin@tummy.com> - 20080309-2
+- Add mime info for .sfd files. Fixes 240669
+
 * Mon Mar 17 2008 Kevin Fenzi <kevin@tummy.com> - 20080309-1
 - Upgrade to 20080309
 - Fixes bug 437833
diff --git a/fontforge.xml b/fontforge.xml
new file mode 100644
index 0000000..af84a5a
--- /dev/null
+++ b/fontforge.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/vnd.font-fontforge-sfd">
+     <sub-class-of type="text/plain"/>
+     <comment>Fontforge Spline Font Database</comment>
+     <glob pattern="*.sfd"/>
+     <magic>
+       <match type="string" offset="0" value="SplineFontDB"/>
+     </magic>
+   </mime-type>
+</mime-info>
diff --git a/sources b/sources
index 56dbff2..cc6a5a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-96916b6a6f926551f1a775fa5d456738  fontforge_full-20080309.tar.bz2
-dfe77acaa6c0c3140baa9dc499af9066  fontforge_htdocs-20080302.tar.bz2
+ca239de93aeceed08c263333d0e898c8  fontforge_full-20080429.tar.bz2
+17def25d0a140a1e3359c0287d694bc6  fontforge_htdocs-20080429.tar.bz2