2004-02-23 Stephen Browne <
[email protected]>
* gnome-mime-data.spec: new tarball, bringover QS patches
* patches/gnome-mime-data-06-swf-handler.diff: new from QS
* patches/gnome-mime-data-07-jar-handler.diff: new from QS
* patches/gnome-mime-data-08-i18n-keys.diff: new from QS
patch 02 and patch 08 still need work so theyre disabled
--- a/ChangeLog Mon Feb 23 11:18:00 2004 +0000
+++ b/ChangeLog Mon Feb 23 11:44:51 2004 +0000
@@ -1,3 +1,13 @@
+2004-02-23 Stephen Browne <[email protected]>
+
+ * gnome-mime-data.spec: new tarball, bringover QS patches
+ * patches/gnome-mime-data-06-swf-handler.diff: new from QS
+ * patches/gnome-mime-data-07-jar-handler.diff: new from QS
+ * patches/gnome-mime-data-08-i18n-keys.diff: new from QS
+
+ patch 02 and patch 08 still need work so theyre disabled
+
+
2004-02-24 Glynn Foster <[email protected]>
* libbonobo.spec: setup -q
--- a/gnome-mime-data.spec Mon Feb 23 11:18:00 2004 +0000
+++ b/gnome-mime-data.spec Mon Feb 23 11:44:51 2004 +0000
@@ -2,9 +2,9 @@
License: LGPL
Group: System/GUI/GNOME
BuildArchitectures: noarch
-Version: 2.4.0
-Release: 7
-Distribution: Mercury
+Version: 2.4.1
+Release: 1
+Distribution: Cinnabar
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
@@ -18,6 +18,9 @@
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
+Patch6: gnome-mime-data-06-swf-handler.diff
+Patch7: gnome-mime-data-07-jar-handler.diff
+Patch8: gnome-mime-data-08-i18n-keys.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -36,10 +39,13 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+#%patch8 -p1
bzcat %SOURCE1 | tar xvf -
%build
@@ -80,6 +86,9 @@
%{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
%changelog
+* Mon Feb 23 2004 - <[email protected]>
+- New tarball 2.4.1, ported patches, still two patches to do
+
* Thu Jan 29 2004 - <[email protected]>
- Add dependency on intltool
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mime-data-06-swf-handler.diff Mon Feb 23 11:44:51 2004 +0000
@@ -0,0 +1,15 @@
+--- gnome-mime-data-2.2.1/gnome-vfs.keys.in 2004-01-16 15:51:25.000000000 -0800
++++ gnome-mime-data-2.2.1-new/gnome-vfs.keys.in 2004-01-16 15:48:12.000000000 -0800
+@@ -871,7 +871,12 @@ application/x-shared-library-la
+
+ application/x-shockwave-flash
+ _description=Macromedia Flash file
++ default_action_type=application
++ short_list_application_ids_for_novice_user_level=mozilla
++ short_list_application_ids_for_intermediate_user_level=mozilla
++ short_list_application_ids_for_advanced_user_level=mozilla
+ _category=Documents/World Wide Web
++ use_category_default=yes
+
+ application/x-slp
+ _description=Stampede package
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mime-data-07-jar-handler.diff Mon Feb 23 11:44:51 2004 +0000
@@ -0,0 +1,36 @@
+diff -ur gnome-mime-data-2.2.1/gnome-vfs.applications gmd/gnome-vfs.applications
+--- gnome-mime-data-2.2.1/gnome-vfs.applications 2004-02-18 10:35:46.000000000 +0000
++++ gmd/gnome-vfs.applications 2004-02-18 10:39:23.000000000 +0000
+@@ -235,6 +235,14 @@
+ requires_terminal=true
+ mime_types=application/x-java-byte-code
+
++java-jar
++ command=java -jar
++ name=Java Interpreter
++ can_open_multiple_files=false
++ expects_uris=false
++ requires_terminal=false
++ mime_types=application/x-java-archive
++
+ javac
+ command=javac
+ name=Java compiler
+diff -ur gnome-mime-data-2.2.1/gnome-vfs.keys.in gmd/gnome-vfs.keys.in
+--- gnome-mime-data-2.2.1/gnome-vfs.keys.in 2004-02-18 10:35:57.000000000 +0000
++++ gmd/gnome-vfs.keys.in 2004-02-18 10:39:47.000000000 +0000
+@@ -657,6 +657,14 @@
+ _description=Java byte code
+ _category=Software Development
+
++application/x-java-archive
++ _description=Java archive
++ default_action_type=application
++ short_list_application_ids_for_novice_user_level=java-jar
++ short_list_application_ids_for_intermediate_user_level=java-jar
++ short_list_application_ids_for_advanced_user_level=java-jar
++ _category=Packages
++
+ application/x-jbuilder-project
+ _description=JBuilder Project
+ default_action_type=application
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mime-data-08-i18n-keys.diff Mon Feb 23 11:44:51 2004 +0000
@@ -0,0 +1,86 @@
+diff -urN gnome-mime-data-2.2.1-orig/gnome-vfs.keys.in gnome-mime-data-2.2.1/gnome-vfs.keys.in
+--- gnome-mime-data-2.2.1-orig/gnome-vfs.keys.in 2004-02-10 10:58:40.000000000 +0900
++++ gnome-mime-data-2.2.1/gnome-vfs.keys.in 2004-02-10 11:12:14.000000000 +0900
+@@ -1160,6 +1160,7 @@
+ short_list_application_ids_for_novice_user_level=xmms-no-uris,freeamp-no-uris
+ short_list_application_ids_for_intermediate_user_level=xmms-no-uris,freeamp-no-uris
+ short_list_application_ids_for_advanced_user_level=xmms-no-uris,freeamp-no-uris
++ _category=Audio
+
+ audio/x-stm
+ _description=Scream Tracker audio
+@@ -1198,6 +1199,21 @@
+ _description=FastTracker II audio
+ _category=Audio
+
++audio/vnd.rn-realaudio
++ _category=Audio
++
++audio/x-pn-aiff
++ _category=Audio
++
++audio/x-pn-au
++ _category=Audio
++
++audio/x-pn-wav
++ _category=Audio
++
++audio/x-pn-windows-acm
++ _category=Audio
++
+ # also image/x-bmp
+ image/bmp
+ _description=Windows bitmap image
+@@ -1346,6 +1362,7 @@
+ short_list_application_ids_for_novice_user_level=openoffice,staroffice
+ short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+ short_list_application_ids_for_advanced_user_level=openoffice,staroffice
++ _category=Images
+
+ image/x-fits
+ _description=Flexible Image Transport System
+@@ -1416,18 +1433,21 @@
+ short_list_application_ids_for_novice_user_level=openoffice,staroffice,gimp
+ short_list_application_ids_for_intermediate_user_level=openoffice,staroffice,gimp
+ short_list_application_ids_for_advanced_user_level=openoffice,staroffice,gimp
++ _category=Images
+
+ image/x-photo-cd
+ _description=Photo CD image
+ short_list_application_ids_for_novice_user_level=openoffice,staroffice
+ short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+ short_list_application_ids_for_advanced_user_level=openoffice,staroffice
++ _category=Images
+
+ image/x-pict
+ _description=PICT image
+ short_list_application_ids_for_novice_user_level=openoffice,staroffice
+ short_list_application_ids_for_intermediate_user_level=openoffice,staroffice
+ short_list_application_ids_for_advanced_user_level=openoffice,staroffice
++ _category=Images
+
+ # also image/png
+ image/x-png
+@@ -1585,6 +1605,12 @@
+ short_list_application_ids_for_advanced_user_level=gimp
+ _category=Images
+
++image/vnd.rn-realflash
++ _category=Images
++
++image/vnd.rn-realpix
++ _category=Images
++
+ message/delivery-status
+ _description=mail delivery report
+ _category=Message
+@@ -2083,6 +2109,9 @@
+ short_list_application_ids_for_advanced_user_level=xanim
+ _category=Video
+
++video/vnd.rn-realvideo
++ _category=Video
++
+ x-directory/normal
+ _description=folder
+ default_action_type=component