rpms/fontforge/devel fontforge.xml, NONE, 1.1 fontforge.spec, 1.33, 1.34 sources, 1.19, 1.20 .cvsignore, 1.19, 1.20

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11243

Modified Files:
	fontforge.spec sources .cvsignore 
Added Files:
	fontforge.xml 
Log Message:
Upgrade to 20080429
Add mime info for .sfd files. Fixes 240669



--- NEW FILE fontforge.xml ---
<?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>


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fontforge.spec	17 Mar 2008 22:12:02 -0000	1.33
+++ fontforge.spec	18 May 2008 16:17:11 -0000	1.34
@@ -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 @@
 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 @@
 # 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
-
-%postun -p /sbin/ldconfig
+%post
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+/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 @@
 %{_datadir}/fontforge
 %{_datadir}/pixmaps/fontforge.png
 %{_mandir}/man1/*.1*
+%{_datadir}/mime/packages/fontforge.xml
 
 %files devel
 %defattr(-,root,root,-)
@@ -126,6 +138,12 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri May 16 2008 Kevin Fenzi <kevin at tummy.com> - 20080429-1
+- Upgrade to 20080429
+
+* Mon Mar 24 2008 Kevin Fenzi <kevin at tummy.com> - 20080309-2
+- Add mime info for .sfd files. Fixes 240669
+
 * Mon Mar 17 2008 Kevin Fenzi <kevin at tummy.com> - 20080309-1
 - Upgrade to 20080309
 - Fixes bug 437833


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Mar 2008 22:23:39 -0000	1.19
+++ sources	18 May 2008 16:17:11 -0000	1.20
@@ -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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Mar 2008 22:23:39 -0000	1.19
+++ .cvsignore	18 May 2008 16:17:11 -0000	1.20
@@ -1,2 +1,2 @@
-fontforge_full-20080309.tar.bz2
-fontforge_htdocs-20080302.tar.bz2
+fontforge_full-20080429.tar.bz2
+fontforge_htdocs-20080429.tar.bz2