--- a/gnome-mime-data.spec	Sun Dec 14 23:50:14 2003 +0000
+++ b/gnome-mime-data.spec	Mon Dec 15 00:29:43 2003 +0000
@@ -3,16 +3,21 @@
 Group:			System/GUI/GNOME
 BuildArchitectures:	noarch
 Version:		2.4.0
-Release:		3
+Release:		4
 Distribution:		Mercury
 Vendor:			Sun Microsystems, Inc.
 Summary:		MIME Type and Application Database for the GNOME Desktop
 Source:			http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/%{name}-%{version}.tar.bz2
-Source1:                gnome-mime-data-l10n-po.tar.bz2
+Source1:                gnome-mime-data-l10n-po-0.6.tar.bz2
+Source2:                gnome-vfs.mime.4.gz
+Source3:                gnome-vfs-mime-magic.4.gz
+Source4:                gnome-vfs.applications.4.gz
+Source5:                gnome-vfs.keys.4.gz
 Patch1:                 gnome-mime-data-01-view-as-audio-component.diff
-Patch2:			gnome-mime-data-02-make-jmplay-default-player.diff
+Patch2:                 gnome-mime-data-02-make-jmplay-default-player.diff
 Patch3:                 gnome-mime-data-03-view-as-webpage.diff
 Patch4:                 gnome-mime-data-04-text-plain-handler.diff
+Patch5:                 gnome-mime-data-05-always-use-app.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -28,11 +33,12 @@
 description, and to launch them with suitable applications.
 
 %prep
-%setup
-%patch1
+%setup -q
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 tar jxvf %SOURCE1
 %build
@@ -43,7 +49,17 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-
+make DESTDIR=$RPM_BUILD_ROOT install
+install -d $RPM_BUILD_ROOT/usr/share/man/man4
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man4
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man4
+install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/man/man4
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/man/man4
+#Copy zh_HK from zh_TW
+#Fixes bug 4930405
+install -d $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES
+install --mode=0644 $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES/
+                                                                                                                                                             
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,12 +69,15 @@
 %{_sysconfdir}/gnome-vfs-mime-magic
 %{_datadir}/mime-info/*
 %{_datadir}/application-registry/*
-%{_mandir}/man5/*
+%{_mandir}/man4/*
 # This package is so small, it's not worth doing a -devel package
 # just for the pkgconfig file.
 %{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
 
 %changelog
+* Mon Dec 15 2003 - <[email protected]
+- Add back the man pages, and some patches.
+
 * Mon Oct 20 2003 - <[email protected]
 - Added patch gnome-mime-data-04-text-plain-handler.diff which was in
   Mercury so that gedit is lauched instead of text viewer for nautilus