]>
Commit | Line | Data |
---|---|---|
70f8787d JR |
1 | --- rpm-5.4.7/lib/rpmfc.c.kmod~ 2012-03-16 16:34:04.640654829 +0100 |
2 | +++ rpm-5.4.7/lib/rpmfc.c 2012-03-16 16:34:04.644654834 +0100 | |
3 | @@ -981,6 +981,19 @@ static int rpmfcSCRIPT(rpmfc fc) | |
4 | xx = rpmfcHelper(fc, 'P', "gstreamer"); | |
5 | /* XXX: currently of no use, but for the sake of consistency... */ | |
6 | xx = rpmfcHelper(fc, 'R', "gstreamer"); | |
7 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) | |
8 | + } else | |
9 | + if ((fc->fcolor->vals[fc->ix] & RPMFC_MODULE)) { | |
10 | + miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS); | |
11 | + if (!mireRegcomp(mire, "^.*((/lib/modules/|/var/lib/dkms/).*\\.ko(\\.gz|\\.xz)?|(/var/lib/dkms-binary/[^/]+/[^/]+|/usr/src)/[^/]+/dkms.conf)$")) | |
12 | + if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0) { | |
13 | + fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT); | |
14 | + xx = rpmfcHelper(fc, 'P', "kernel"); | |
15 | + /* XXX: currently of no use, but for the sake of consistency... */ | |
16 | + xx = rpmfcHelper(fc, 'R', "kernel"); | |
17 | + } | |
18 | + mire = mireFree(mire); | |
19 | +#endif | |
20 | } else | |
21 | if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) { | |
22 | xx = rpmfcHelper(fc, 'P', "java"); | |
23 | @@ -1188,6 +1201,14 @@ assert(fc->fn != NULL); | |
24 | else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) && | |
25 | fc->fcolor->vals[fc->ix] & RPMFC_LIBRARY) | |
26 | fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT); | |
27 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) | |
28 | + } else { | |
29 | + miRE mire = mireNew(RPMMIRE_REGEX, RPMTAG_FILEPATHS); | |
30 | + if (!mireRegcomp(mire, "^.*((/lib/modules/|/var/lib/dkms/).*\\.ko(\\.gz|\\.xz)?|(/var/lib/dkms-binary/[^/]+/[^/]+|/usr/src)/[^/]+/dkms.conf)$")) | |
31 | + if (mireRegexec(mire, fc->fn[fc->ix], (size_t) 0) >= 0) | |
32 | + fc->fcolor->vals[fc->ix] |= (RPMFC_MODULE|RPMFC_SCRIPT); | |
33 | + mire = mireFree(mire); | |
34 | +#endif | |
35 | } | |
36 | } | |
37 | ||
38 | --- rpm-5.4.7/macros/kernel.in.kmod~ 2011-04-10 12:54:18.000000000 +0200 | |
39 | +++ rpm-5.4.7/macros/kernel.in 2012-03-16 16:37:04.277948160 +0100 | |
40 | @@ -2,11 +2,11 @@ | |
41 | # To make use of these macros insert the following line into your spec file: | |
42 | # %{load:%{_usrlibrpm}/macros.d/kernel} | |
43 | ||
44 | -%__modinfo @__MODINFO | |
45 | +%__modinfo @__MODINFO@ | |
46 | ||
47 | # Path to scripts to autogenerate gstreamer package dependencies, | |
48 | # | |
49 | -# Note: Used if _use_internal_dependency_generator is non-zero. The | |
50 | +# Note: Used iff _use_internal_dependency_generator is non-zero. The | |
51 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. | |
52 | %__kernel_provides %{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo | |
53 | #%__kernel_requires %{_rpmhome}/kmod-deps.sh --requires --modinfo %__modinfo | |
54 | --- rpm-5.4.7/macros/macros.in.kmod~ 2012-03-16 16:34:04.614654786 +0100 | |
55 | +++ rpm-5.4.7/macros/macros.in 2012-03-16 16:34:04.645654836 +0100 | |
56 | @@ -981,6 +981,10 @@ $_arbitrary_tags_tests Foo:Bar | |
57 | %{load:%{_usrlibrpm}/macros.d/haskell} | |
58 | ||
59 | #------------------------------------------------------------------------ | |
60 | +# kmod(...) configuration. | |
61 | +%{load:%{_usrlibrpm}/macros.d/kernel} | |
62 | + | |
63 | +#------------------------------------------------------------------------ | |
64 | # perl(...) configuration | |
65 | %{load:%{_usrlibrpm}/macros.d/perl} | |
66 |