Hello community, here is the log from the commit of package shared-mime-info checked in at Tue Apr 25 18:30:47 CEST 2006. -------- --- shared-mime-info/shared-mime-info.changes 2006-03-15 13:59:03.000000000 +0100 +++ STABLE/shared-mime-info/shared-mime-info.changes 2006-04-25 18:08:24.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 25 18:07:31 CEST 2006 - sbrabec@suse.cz + +- Fixed C* source code MIME type conflicts (#168763). + +------------------------------------------------------------------- New: ---- shared-mime-info-csrc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.dQL4Ho/_old 2006-04-25 18:30:04.000000000 +0200 +++ /var/tmp/diff_new_pack.dQL4Ho/_new 2006-04-25 18:30:04.000000000 +0200 @@ -13,7 +13,7 @@ Name: shared-mime-info BuildRequires: glib2-devel gnome-patch-translation intltool libxml2-devel perl-XML-Parser Version: 0.17 -Release: 1 +Release: 6 URL: http://freedesktop.org/wiki/Software/shared-mime-info Group: System/X11/Utilities License: GPL @@ -25,6 +25,7 @@ Patch3: da.patch Patch4: typos.patch Patch6: shared-mime-info-wma.patch +Patch7: shared-mime-info-csrc.patch Autoreqprov: on # needed by mime-info-to-mime: Requires: /bin/rm /bin/mkdir /usr/bin/fgrep @@ -54,6 +55,7 @@ %patch4 %patch %patch6 +%patch7 gnome-patch-translation-update rm po/no.* @@ -88,6 +90,8 @@ /usr/%{_lib}/pkgconfig/*.pc %changelog -n shared-mime-info +* Tue Apr 25 2006 - sbrabec@suse.cz +- Fixed C* source code MIME type conflicts (#168763). * Wed Mar 15 2006 - sbrabec@suse.cz - Updated to a 0.17 release. - Use sub-class-of instead of alias for wma and wmv (156207#c10). ++++++ shared-mime-info-csrc.patch ++++++ --- freedesktop.org.xml.in +++ freedesktop.org.xml.in @@ -2356,7 +2356,7 @@ <_comment>XPM image <acronym>XPM</acronym> <expanded-acronym>X PixMap</expanded-acronym> - <magic priority="80"> + <magic priority="50"> <match type="string" value="/* XPM" offset="0"/> </magic> <glob pattern="*.xpm"/> @@ -2576,13 +2576,15 @@ <glob pattern="*.bib"/> </mime-type> <mime-type type="text/x-c++hdr"> - <sub-class-of type="text/plain"/> + <sub-class-of type="text/x-chdr"/> <_comment>C++ header <glob pattern="*.hh"/> + <glob pattern="*.hp"/> <glob pattern="*.hpp"/> + <glob pattern="*.h++"/> </mime-type> <mime-type type="text/x-c++src"> - <sub-class-of type="text/plain"/> + <sub-class-of type="text/x-csrc"/> <_comment>C++ source code <glob pattern="*.cpp"/> <glob pattern="*.cxx"/> @@ -2596,16 +2598,9 @@ <glob pattern="ChangeLog"/> </mime-type> <mime-type type="text/x-chdr"> - <sub-class-of type="text/plain"/> + <sub-class-of type="text/x-csrc"/> <_comment>C header - <magic priority="50"> - <match type="string" value="/*" offset="0"/> - <match type="string" value="//" offset="0"/> - <match type="string" value="#include" offset="0"/> - </magic> <glob pattern="*.h"/> - <glob pattern="*.h++"/> - <glob pattern="*.hp"/> </mime-type> <mime-type type="text/x-comma-separated-values"> <sub-class-of type="text/plain"/> @@ -2626,16 +2621,19 @@ <sub-class-of type="text/plain"/> <_comment>C source code <glob pattern="*.c"/> - <magic priority="50"> + <magic priority="30"> <match type="string" value="/*" offset="0"/> <match type="string" value="//" offset="0"/> <match type="string" value="#include" offset="0"/> </magic> </mime-type> <mime-type type="text/x-csharp"> - <sub-class-of type="text/plain"/> + <sub-class-of type="text/x-csrc"/> <_comment>C# source code <glob pattern="*.cs"/> + <magic priority="30"> + <match value="using" type="string" offset="0"/> + </magic> </mime-type> <mime-type type="text/x-dcl"> <sub-class-of type="text/plain"/> @@ -2782,11 +2780,9 @@ <glob pattern="*.not"/> </mime-type> <mime-type type="text/x-objcsrc"> - <sub-class-of type="text/plain"/> + <sub-class-of type="text/x-csrc"/> <_comment>Objective-C source code - <magic priority="50"> - <match type="string" value="/*" offset="0"/> - <match type="string" value="//" offset="0"/> + <magic priority="30"> <match type="string" value="#import" offset="0"/> </magic> <glob pattern="*.m"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...