Attachment 9844 Details for Bug 22237 – util-linux 2.31.1 patch

[patch] util-linux 2.31.1 patch

util-linux-2.31.1-update.patch (text/plain), 2.19 KB, created by Stig-Ørjan Smelror on 2017-12-19 23:23:36 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Stig-Ørjan Smelror

Created: 2017-12-19 23:23:36 CET

Size: 2.19 KB

patch

obsolete

>Index: SOURCES/sha1.lst
>===================================================================
>--- SOURCES/sha1.lst	(revision 1183511)
>+++ SOURCES/sha1.lst	(working copy)
>@@ -1 +0,0 @@
>-030b92cede3d68816d3206645c4262599175ec8a  util-linux-2.30.1.tar.xz
>Index: SPECS/util-linux.spec
>===================================================================
>--- SPECS/util-linux.spec	(revision 1183511)
>+++ SPECS/util-linux.spec	(working copy)
>@@ -1,6 +1,6 @@
>-%define mainver 2.30
>+%define mainver 2.31
> %define rc_ver 0
>-%define rel 2
>+%define rel 1
> %if %{rc_ver}
> %define release %mkrel 1.rc%{rc_ver}.%{rel}
> %define tarname %{name}-%{version}-rc%{rc_ver}
>@@ -45,7 +45,7 @@
> ### Header
> Summary:	A collection of basic system utilities
> Name:		util-linux
>-Version:	2.30.1
>+Version:	2.31.1
> Release:	%{release}
> License:	GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
> Group:		System/Base
>@@ -104,6 +104,11 @@
> Provides:	eject = %{version}-%{release}
> Conflicts:	bash-completion < 2:2.1-3
> 
>+# Obsoletes rfkill
>+Obsoletes:	rfkill
>+Provides:	rfkill = %{version}-%{release}
>+Conflicts:	rfkill < 1:0.5
>+
> Requires(pre):	filesystem >= 2.1.9-18
> Requires(preun): info-install
> Requires(post):	info-install
>@@ -128,7 +133,7 @@
> 
> ### Ready for upstream?
> ###
>-# 151635 - makeing /var/log/lastlog
>+# 151635 - making /var/log/lastlog
> Patch0:		2.28-login-lastlog-create.patch
> 
> # upstream patches
>@@ -486,6 +491,7 @@
> %{_bindir}/setpriv
> %attr(4755,root,root)	%{_bindir}/su
> %{_bindir}/taskset
>+%{_bindir}/uuidparse
> %attr(2555,root,tty) %{_bindir}/wall
> %{_bindir}/wdctl
> %{_bindir}/raw
>@@ -510,6 +516,7 @@
> %{_sbindir}/fstrim
> %{_sbindir}/partx
> %{_sbindir}/pivot_root
>+%{_sbindir}/rfkill
> %{_sbindir}/runuser
> %{_sbindir}/swaplabel
> %{_sbindir}/zramctl
>@@ -520,6 +527,7 @@
> %{_mandir}/man1/mountpoint.1*
> %{_mandir}/man1/nsenter.1*
> %{_mandir}/man1/setpriv.1*
>+%{_mandir}/man1/uuidparse.1*
> %{_mandir}/man1/wall.1*
> %{_mandir}/man8/agetty.8*
> %{_mandir}/man8/addpart.8*
>@@ -529,6 +537,7 @@
> %{_mandir}/man8/fstrim.8*
> %{_mandir}/man8/lsblk.8*
> %{_mandir}/man8/partx.8*
>+%{_mandir}/man8/rfkill.8*
> %{_mandir}/man8/swaplabel.8*
> %{_mandir}/man8/zramctl.8*
> %ifarch %ix86 alpha ia64 x86_64 s390 s390x ppc ppc64 %{sunsparc} %mips %arm

Index: SOURCES/sha1.lst
===================================================================
--- SOURCES/sha1.lst	(revision 1183511)
+++ SOURCES/sha1.lst	(working copy)
@@ -1 +0,0 @@
-030b92cede3d68816d3206645c4262599175ec8a  util-linux-2.30.1.tar.xz
Index: SPECS/util-linux.spec
===================================================================
--- SPECS/util-linux.spec	(revision 1183511)
+++ SPECS/util-linux.spec	(working copy)
@@ -1,6 +1,6 @@
-%define mainver 2.30
+%define mainver 2.31
 %define rc_ver 0
-%define rel 2
+%define rel 1
 %if %{rc_ver}
 %define release %mkrel 1.rc%{rc_ver}.%{rel}
 %define tarname %{name}-%{version}-rc%{rc_ver}
@@ -45,7 +45,7 @@
 ### Header
 Summary:	A collection of basic system utilities
 Name:		util-linux
-Version:	2.30.1
+Version:	2.31.1
 Release:	%{release}
 License:	GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group:		System/Base
@@ -104,6 +104,11 @@
 Provides:	eject = %{version}-%{release}
 Conflicts:	bash-completion < 2:2.1-3
 
+# Obsoletes rfkill
+Obsoletes:	rfkill
+Provides:	rfkill = %{version}-%{release}
+Conflicts:	rfkill < 1:0.5
+
 Requires(pre):	filesystem >= 2.1.9-18
 Requires(preun): info-install
 Requires(post):	info-install
@@ -128,7 +133,7 @@
 
 ### Ready for upstream?
 ###
-# 151635 - makeing /var/log/lastlog
+# 151635 - making /var/log/lastlog
 Patch0:		2.28-login-lastlog-create.patch
 
 # upstream patches
@@ -486,6 +491,7 @@
 %{_bindir}/setpriv
 %attr(4755,root,root)	%{_bindir}/su
 %{_bindir}/taskset
+%{_bindir}/uuidparse
 %attr(2555,root,tty) %{_bindir}/wall
 %{_bindir}/wdctl
 %{_bindir}/raw
@@ -510,6 +516,7 @@
 %{_sbindir}/fstrim
 %{_sbindir}/partx
 %{_sbindir}/pivot_root
+%{_sbindir}/rfkill
 %{_sbindir}/runuser
 %{_sbindir}/swaplabel
 %{_sbindir}/zramctl
@@ -520,6 +527,7 @@
 %{_mandir}/man1/mountpoint.1*
 %{_mandir}/man1/nsenter.1*
 %{_mandir}/man1/setpriv.1*
+%{_mandir}/man1/uuidparse.1*
 %{_mandir}/man1/wall.1*
 %{_mandir}/man8/agetty.8*
 %{_mandir}/man8/addpart.8*
@@ -529,6 +537,7 @@
 %{_mandir}/man8/fstrim.8*
 %{_mandir}/man8/lsblk.8*
 %{_mandir}/man8/partx.8*
+%{_mandir}/man8/rfkill.8*
 %{_mandir}/man8/swaplabel.8*
 %{_mandir}/man8/zramctl.8*
 %ifarch %ix86 alpha ia64 x86_64 s390 s390x ppc ppc64 %{sunsparc} %mips %arm

Actions: View | Diff

Attachments on bug 22237: 9844