-diff -urN rpm-4.4.9/lib/rpmfc.c rpm-4.4.9.new/lib/rpmfc.c
---- rpm-4.4.9/lib/rpmfc.c 2008-05-06 16:27:09.000000000 +0200
-+++ rpm-4.4.9.new/lib/rpmfc.c 2008-05-06 16:33:48.000000000 +0200
-@@ -531,6 +531,8 @@
+diff -urN rpm-5.1.4/lib/rpmfc.c rpm-5.1.4.new/lib/rpmfc.c
+--- rpm-5.1.4/lib/rpmfc.c 2008-07-29 19:36:38.000000000 +0200
++++ rpm-5.1.4.new/lib/rpmfc.c 2008-07-29 19:43:42.000000000 +0200
+@@ -527,6 +527,8 @@
{ "troff or preprocessor input", RPMFC_MANPAGE|RPMFC_INCLUDE },
{ "GNU Info", RPMFC_MANPAGE|RPMFC_INCLUDE },
-+ { "Desktop E", RPMFC_DESKTOP_FILE|RPMFC_INCLUDE },
++ { "Desktop Entry", RPMFC_DESKTOP_FILE|RPMFC_INCLUDE },
+
{ "perl script text", RPMFC_PERL|RPMFC_INCLUDE },
{ "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
-@@ -872,6 +874,10 @@
- xx = rpmfcHelper(fc, 'P', "java", fc->noautoprov, fc->noautoprov_c);
- if (fc->findreq)
- xx = rpmfcHelper(fc, 'R', "java", fc->noautoreq, fc->noautoreq_c);
+@@ -875,6 +877,9 @@
+ if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) {
+ xx = rpmfcHelper(fc, 'P', "java");
+ xx = rpmfcHelper(fc, 'R', "java");
+ } else
+ if (fc->fcolor->vals[fc->ix] & RPMFC_DESKTOP_FILE) {
-+ if (fc->findprov)
-+ xx = rpmfcHelper(fc, 'P', "mimetype", fc->noautoprov, fc->noautoprov_c);
++ xx = rpmfcHelper(fc, 'P', "mimetype");
}
- return 0;
-@@ -984,7 +990,7 @@
+ /*@-observertrans@*/
+@@ -957,7 +963,7 @@
/*@unchecked@*/
static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
{ rpmfcELF, RPMFC_ELF },
-- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP) },
-+ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_DESKTOP_FILE) },
- { rpmfcMONO, RPMFC_MONO },
- { NULL, 0 }
- };
-@@ -1350,6 +1356,10 @@
+- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_FONT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) },
++ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_FONT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB|RPMFC_DESKTOP_FILE) },
+ #if defined(RPM_VENDOR_MANDRIVA)
+ { rpmfcSYMLINK, RPMFC_SYMLINK },
+ #endif
+@@ -1311,6 +1317,9 @@
else if (_suffix(s, ".php"))
ftype = "PHP script text";
-+ /* XXX all files with extension ".desktop" are desktop files for now. */
+ else if (_suffix(s, ".desktop"))
+ ftype = "Desktop Entry";
+
- /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
- else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
- ftype = "";
-diff -urN rpm-4.4.9/lib/rpmfc.h rpm-4.4.9.new/lib/rpmfc.h
---- rpm-4.4.9/lib/rpmfc.h 2008-05-06 16:27:09.000000000 +0200
-+++ rpm-4.4.9.new/lib/rpmfc.h 2008-05-06 16:28:44.000000000 +0200
-@@ -53,6 +53,7 @@
- RPMFC_FONT = (1 << 21),
- RPMFC_IMAGE = (1 << 22),
- RPMFC_MANPAGE = (1 << 23),
-+ RPMFC_DESKTOP_FILE = (1 << 11),
+ /* XXX files with extension ".typelib" are GNOME typelib for now. */
+ else if (_suffix(s, ".typelib"))
+ ftype = "G-IR binary database";
+diff -urN rpm-5.1.4/lib/rpmfc.h rpm-5.1.4.new/lib/rpmfc.h
+--- rpm-5.1.4/lib/rpmfc.h 2008-07-29 19:36:38.000000000 +0200
++++ rpm-5.1.4.new/lib/rpmfc.h 2008-07-29 19:44:27.000000000 +0200
+@@ -28,7 +28,7 @@
+ #define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32)
+ /* (1 << 3) leaks into package headers, reserved */
- RPMFC_PERL = (1 << 24),
- RPMFC_JAVA = (1 << 25),
-diff -urN rpm-4.4.9/macros.in rpm-4.4.9.new/macros.in
---- rpm-4.4.9/macros.in 2008-05-06 16:27:09.000000000 +0200
-+++ rpm-4.4.9.new/macros.in 2008-05-06 16:24:15.000000000 +0200
-@@ -1461,6 +1461,16 @@
- #%__executable_requires %{_usrlibrpm}/executabledeps.sh --requires
- #%__scriptlet_requires /bin/bash --rpm-requires
+- /* bit 4 unused */
++ RPMFC_DESKTOP_FILE = (1 << 4),
+ RPMFC_TYPELIB = (1 << 5),
+ RPMFC_HASKELL = (1 << 6),
+ RPMFC_RUBY = (1 << 7),
+diff -urN rpm-5.1.4/macros/macros.in rpm-5.1.4.new/macros/macros.in
+--- rpm-5.1.4/macros/macros.in 2008-07-29 19:36:38.000000000 +0200
++++ rpm-5.1.4.new/macros/macros.in 2008-07-29 19:45:45.000000000 +0200
+@@ -1617,6 +1617,16 @@
+ #}1}%{rpm_license_check}
-+#------------------------------------------------------------------------
+ #------------------------------------------------------------------------
+# mimetype(...) configuration.
+#
+# Path to script to autogenerate mimetype(foo) provides, based on MimeType
+# helper is also used by %{_uselibrpm}/rpmdeps --provides
+%__mimetype_provides %{_usrlibrpm}/mimetypedeps.sh --provides
+
- # PLD rpm macros
- %_enable_debug_packages 1
-
++#------------------------------------------------------------------------
+ # executable(...) configuration.
+ #
+ # Path to scripts to autogenerate executable(foo) script dependencies,
projects / packages / rpm.git / blobdiff