From c0b357c927373241ee8df189b95ae5e7b657fb07 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Jan 26 2014 19:33:04 +0000
Subject: import os-prober-1.58-5.el7.src.rpm


---

diff --git a/SOURCES/os-prober-man.patch b/SOURCES/os-prober-man.patch
new file mode 100644
index 0000000..9c937a9
--- /dev/null
+++ b/SOURCES/os-prober-man.patch
@@ -0,0 +1,59 @@
+diff -urpN os-prober-1.58/linux-boot-prober.1.man os-prober-1.58/linux-boot-prober.1
+--- os-prober-1.58/linux-boot-prober.1.man	2014-01-20 15:52:00.354946125 -0500
++++ os-prober-1.58/linux-boot-prober.1	2014-01-20 15:55:18.736367600 -0500
+@@ -0,0 +1,27 @@
++.TH linux-boot-prober 1 "20 Jan 2014" "linux-boot-prober"
++.SH "NAME"
++linux-boot-prober \(em Determine boot characteristics of a specified device.
++.SH "SYNOPSIS"
++.B linux-boot-prober
++.I <partition>
++.SH "DESCRIPTION"
++.PP
++The \fBlinux-boot-prober\fR utility will try to work out how to boot the
++linux root partition specified by \fI<partition>\fR.  If successful, it
++will outoput one or more lines of the form:
++
++<root partition>:<boot partition>:<label>:<kernel path>:<initrd path>:<kernel parameters>
++
++For example, for a system with a kernel at \fI/boot/vmlinuz\fR and an
++initramfs at \fI/boot/initrd.gz\fR, and with \fI/\fR on \fI/dev/sda2\fR and
++\fI/boot\fR on \fI/dev/sda1\fR, the command "linux-boot-prober /dev/sda1" will
++display:
++
++/dev/sda2:/dev/sda1:Linux:/vmlinuz:/initrd.gz:root=/dev/sda1
++
++Some partitions will not be displayed by \fBlinux-boot-prober\fI.  If a
++partition is mounted on \fI/\fR, \fI/target\fR, or \fI/target/boot\fR, it will
++be skipped.
++.SH "SEE ALSO"
++.PP
++\fBos-prober\fR(1)
+diff -urpN os-prober-1.58/os-prober.1.man os-prober-1.58/os-prober.1
+--- os-prober-1.58/os-prober.1.man	2014-01-20 15:52:04.503934030 -0500
++++ os-prober-1.58/os-prober.1	2014-01-20 15:57:15.300026922 -0500
+@@ -0,0 +1,24 @@
++.TH os-prober 1 "20 Jan 2014" "os-prober"
++.SH "NAME"
++os-prober \(em Discover bootable partitions on the local system.
++.SH "SYNOPSIS"
++.B os-prober
++.SH "DESCRIPTION"
++.PP
++The \fBos-prober\fR utility will scan all disks available on the system for
++other operating systems.  For each discovered OS, it will output a line of
++the form:
++
++<partition>:<descriptive name>:<short name>:<kind of loader>
++
++For example, on system with Windows XP installed on \fI/dev/sda1\fR,
++\fBos-prober\fR will display:
++
++/dev/sda1:Windows NT/2000/XP:WinNT:chain
++
++Note that for Linux systems that are discovered, a call to
++\fBlinux-boot-prober\fI may be required in order to fully discover the
++necessary information to boot the system.
++.SH "SEE ALSO"
++.PP
++\fBlinux-boot-prober\fR(1)
diff --git a/SPECS/os-prober.spec b/SPECS/os-prober.spec
index 8bdb356..9938609 100644
--- a/SPECS/os-prober.spec
+++ b/SPECS/os-prober.spec
@@ -1,6 +1,6 @@
 Name:           os-prober
 Version:        1.58
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        Probes disks on the system for installed operating systems
 
 Group:          System Environment/Base
@@ -24,6 +24,7 @@ Patch9:         os-prober-mounted-partitions-fix.patch
 Patch10:        os-prober-factor-out-logger.patch
 # To be sent upstream
 Patch11:        os-prober-factored-logger-efi-fix.patch
+Patch12:	os-prober-man.patch
 
 Requires:       udev coreutils util-linux
 Requires:       grep /bin/sed /sbin/modprobe
@@ -47,6 +48,7 @@ distributions can be added easily.
 %patch9 -p1 -b .mounted-partitions-fix
 %patch10 -p1 -b .factor-out-logger
 %patch11 -p1 -b .factor-out-logger-efi-fix
+%patch12 -p1 -b .man
 
 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 \
@@ -58,10 +60,12 @@ make %{?_smp_mflags} CFLAGS="%{optflags}"
 %install
 install -m 0755 -d %{buildroot}%{_bindir}
 install -m 0755 -d %{buildroot}%{_var}/lib/%{name}
+install -d 0755 -d %{buildroot}%{_mandir}/man1/
 
 install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}
 install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns
 install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh
+install -m 0644 -Dp *.1 %{buildroot}%{_mandir}/man1/
 
 %ifarch m68k
 ARCH=m68k
@@ -92,11 +96,22 @@ fi
 %files
 %doc README TODO debian/copyright debian/changelog
 %{_bindir}/*
-%{_libexecdir}/*
 %{_datadir}/%{name}
+%{_libexecdir}/*
+%{_mandir}/man1/*
 %{_var}/lib/%{name}
 
 %changelog
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.58-5
+- Mass rebuild 2014-01-24
+
+* Mon Jan 20 2014 Peter Jones <pjones@redhat.com> - 1.58-4
+- Add man pages.
+  Resolves: rhbz#948848
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.58-3
+- Mass rebuild 2013-12-27
+
 * Tue Jun 18 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.58-2
 - Fix a bug in EFI detection because of redirecting result output