Update to upstream version 1.71
- Use git based autosetup for applying patches
This commit is contained in:
parent
d9b021a077
commit
c210816b8b
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@
|
||||
/os-prober_1.65.tar.xz
|
||||
/os-prober_1.68.tar.xz
|
||||
/os-prober_1.70.tar.xz
|
||||
/os-prober_1.71.tar.xz
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: os-prober-1.58/os-probes/mounted/common/90linux-distro
|
||||
===================================================================
|
||||
--- os-prober-1.58.orig/os-probes/mounted/common/90linux-distro
|
||||
+++ os-prober-1.58/os-probes/mounted/common/90linux-distro
|
||||
diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
|
||||
index 9544531..bee48b3 100755
|
||||
--- a/os-probes/mounted/common/90linux-distro
|
||||
+++ b/os-probes/mounted/common/90linux-distro
|
||||
@@ -17,7 +17,7 @@ type="$3"
|
||||
# symlinks we need to also check in $dir/usr/lib* for distributions that
|
||||
# moved /lib* to /usr and only left symlinks behind.
|
||||
@ -11,13 +11,13 @@ Index: os-prober-1.58/os-probes/mounted/common/90linux-distro
|
||||
if [ -e "$dir/etc/debian_version" ]; then
|
||||
short="Debian"
|
||||
long="$(printf "Debian GNU/Linux (%s)\n" "$(cat "$dir/etc/debian_version")")"
|
||||
@@ -125,9 +125,13 @@ if (ls "$dir"/lib*/ld*.so* || ls "$dir"/
|
||||
elif [ -e "$dir/etc/meego-release" ]; then
|
||||
short="MeeGo"
|
||||
long="$(head -1 "$dir/etc/meego-release")"
|
||||
@@ -128,9 +128,13 @@ if (ls "$dir"/lib*/ld*.so* || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null
|
||||
elif [ -e "$dir/etc/4MLinux-version" ]; then
|
||||
short="4MLinux"
|
||||
long="4MLinux $(head -1 "$dir/etc/4MLinux-version")"
|
||||
- else
|
||||
+ elif (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
|
||||
+ # Don't report 'Linux distribution' if only a /lib symlink is found or if this is
|
||||
+ # Don't report 'Linux distribution' if only a /lib symlink is found or if this is
|
||||
+ # a partition without /boot (should be /usr partition)
|
||||
short="Linux"
|
||||
long="unknown Linux distribution"
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: os-prober
|
||||
Version: 1.70
|
||||
Release: 3%{?dist}
|
||||
Version: 1.71
|
||||
Release: 1%{?dist}
|
||||
Summary: Probes disks on the system for installed operating systems
|
||||
|
||||
Group: System Environment/Base
|
||||
@ -32,29 +32,15 @@ Patch15: os-prober-gentoo-fix.patch
|
||||
Requires: udev coreutils util-linux
|
||||
Requires: grep /bin/sed /sbin/modprobe
|
||||
|
||||
BuildRequires: git
|
||||
|
||||
%description
|
||||
This package detects other OSes available on a system and outputs the results
|
||||
in a generic machine-readable format. Support for new OSes and Linux
|
||||
distributions can be added easily.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%autosetup -S git
|
||||
|
||||
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 +91,10 @@ fi
|
||||
%{_var}/lib/%{name}
|
||||
|
||||
%changelog
|
||||
* Fri Mar 04 2016 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.71-1
|
||||
- Update to upstream version 1.71
|
||||
- Use git based autosetup for applying patches
|
||||
|
||||
* 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.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user