]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-old-fileconflicts-behaviour.patch
- add -Werror=trampoline to prevent GCC from generating code that require executable...
[packages/rpm.git] / rpm-old-fileconflicts-behaviour.patch
1 --- rpm-5.3.11/lib/poptI.c~     2011-05-08 01:58:28.000000000 +0300
2 +++ rpm-5.3.11/lib/poptI.c      2011-10-06 18:36:39.099587792 +0300
3 @@ -21,7 +21,7 @@
4  /*@-fullinitblock@*/
5  /*@unchecked@*/
6  struct rpmQVKArguments_s rpmIArgs = {
7 -#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
8 +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */
9      .probFilter = RPMPROB_FILTER_NONE,
10  #else
11      .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
This page took 0.029957 seconds and 3 git commands to generate.