Don't keep backups with '%patch -b .foo'.

When we do '%patch -p1 -b .foo' on the probes, they wind up being in the
ouptut package.  That means we're running the good ones /and/ the broken
ones.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2016-02-15 09:54:24 -05:00
parent c1c2e3b328
commit d9b021a077

View File

@ -1,6 +1,6 @@
Name: os-prober
Version: 1.70
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Probes disks on the system for installed operating systems
Group: System Environment/Base
@ -39,22 +39,22 @@ distributions can be added easily.
%prep
%setup -q
%patch0 -p1 -b .newnsdirfix
%patch1 -p1 -b .macosxdummyfix
%patch2 -p1 -b .mdraidfix
%patch3 -p1 -b .yaboot-parsefix
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1 -b .remove-basename
%patch6 -p1 -b .disable-debug-test
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1 -b .bootpart-name-fix
%patch9 -p1 -b .mounted-partitions-fix
%patch10 -p1 -b .factor-out-logger
%patch11 -p1 -b .factor-out-logger-efi-fix
%patch12 -p1 -b .umount-fix
%patch13 -p1 -b .grub2-parsefix
%patch14 -p1 -b .grepfix
%patch15 -p1 -b .grepfix
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
@ -105,6 +105,9 @@ fi
%{_var}/lib/%{name}
%changelog
* Mon Feb 15 2016 Peter Jones <pjones@redhat.com> - 1.70-3
- Don't keep backups with 'patch -b'; they wind up in the ouput package.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.70-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild