RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 16-Apr-2011 16:27:26
Branch: rpm-5_3 Handle: 2011041614272600
Modified files: (Branch: rpm-5_3)
rpm/lib rpmfc.c
Log:
kernel(...) dependency helper seems to have been missing from earlier
commit, really commit now (and place it under mandriva #ifdef only for
now)
Summary:
Revision Changes Path
1.73.2.8 +19 -0 rpm/lib/rpmfc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.73.2.7 -r1.73.2.8 rpmfc.c
--- rpm/lib/rpmfc.c 12 Apr 2011 08:02:30 -0000 1.73.2.7
+++ rpm/lib/rpmfc.c 16 Apr 2011 14:27:26 -0000 1.73.2.8
@@ -909,6 +909,19 @@
xx = rpmfcHelper(fc, 'P', "gstreamer");
/* XXX: currently of no use, but for the sake of consistency... */
xx = rpmfcHelper(fc, 'R', "gstreamer");
+#if defined(RPM_VENDOR_MANDRIVA)
+ } else
+ if ((fc->fcolor->vals[fc->ix] & RPMFC_MODULE)) {
+ miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
+ if (!mireRegcomp(mire,
"^.*(/lib/modules/|/var/lib/dkms/).*\\.ko(\\.gz|\\.xz)?$"))
+ if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0) {
+ fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT);
+ xx = rpmfcHelper(fc, 'P', "kernel");
+ /* XXX: currently of no use, but for the sake of consistency...
*/
+ xx = rpmfcHelper(fc, 'R', "kernel");
+ }
+ mire = mireFree(mire);
+#endif
}
/*@-observertrans@*/
@@ -1111,6 +1124,12 @@
else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
fc->fcolor->vals[fc->ix] & RPMFC_LIBRARY)
fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT);
+ } else {
+ miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS);
+ if (!mireRegcomp(mire,
"^.*(/lib/modules/|/var/lib/dkms/).*\\.ko(\\.gz|\\.xz)?$"))
+ if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0)
+ fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT);
+ mire = mireFree(mire);
}
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
