rpms/shared-mime-info/devel shared-mime-info-picturecd.patch, NONE, 1.1 shared-mime-info.spec, 1.73, 1.74

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11385

Modified Files:
	shared-mime-info.spec 
Added Files:
	shared-mime-info-picturecd.patch 
Log Message:
* Wed Oct 29 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-4
- Add patch to avoid picture CD being anything with a pictures directory
  (#459365)


shared-mime-info-picturecd.patch:

--- NEW FILE shared-mime-info-picturecd.patch ---
Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.380
diff -u -p -u -p -r1.380 freedesktop.org.xml.in
--- freedesktop.org.xml.in	16 Oct 2008 10:24:31 -0000	1.380
+++ freedesktop.org.xml.in	29 Oct 2008 20:55:38 -0000
@@ -4916,7 +4916,7 @@ command to generate the output files.
          http://www.re.org/kristin/picturecd.html  -->
     <_comment>Picture CD</_comment>
     <treemagic>
-      <treematch path="PICTURES" type="directory" non-empty="true"/>
+      <treematch path="PICTURES" type="directory" non-empty="true" match-case="true"/>
     </treemagic>
   </mime-type>
 


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- shared-mime-info.spec	2 Oct 2008 13:31:45 -0000	1.73
+++ shared-mime-info.spec	29 Oct 2008 21:02:20 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.51
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -11,6 +11,9 @@
 # for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q $i ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi  ; done
 Source2: totem-defaults.list
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=459365
+Patch0: shared-mime-info-picturecd.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  gawk
 BuildRequires:  libxml2-devel
@@ -30,6 +33,8 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .picturecd
+
 %build
 
 %configure --disable-update-mimedb
@@ -63,6 +68,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Oct 29 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-4
+- Add patch to avoid picture CD being anything with a pictures directory
+  (#459365)
+
 * Thu Oct 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-3
 - Use evince, not tetex-xdvi.desktop for DVI files (#465242)