+++ This bug was initially created as a clone of Bug #1080450 +++
Description of problem:
The way patches are applied to files in magic/Magdir is rather fragile. While %patch is run without -b (as also noted in .spec: Don't use -b -- it will lead to poblems when compiling magic file!), for any patch that fails to apply cleanly, .orig backup file is still created. This leads to having both patched and unpatched rules in resulting /usr/share/magic file.
Currently, file-5.04-generic-msdos.patch is misapplied:
+ echo 'Patch #6 (file-5.04-generic-msdos.patch):'
Patch #6 (file-5.04-generic-msdos.patch):
+ /usr/bin/cat /builddir/build/SOURCES/file-5.04-generic-msdos.patch
+ /usr/bin/patch -p1 --fuzz=0
patching file magic/Magdir/msdos
Hunk #1 succeeded at 320 (offset 1 line).
Hunk #2 succeeded at 397 (offset 1 line).
Hunk #3 succeeded at 438 (offset 1 line).
Resulting /usr/share/magic contains both patched and unpatched rules.
Version-Release number of selected component (if applicable):
There are few more in RHEL-6:
Most of them seem to add new rules rather than remove existing, as is the case for file-5.04-generic-msdos.patch.
*** Bug 1254980 has been marked as a duplicate of this bug. ***
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.
For information on the advisory, and where to find the updated
files, follow the link below.
If the solution does not work for you, open a new bug report.