rpms/util-linux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2.19-0.2: clean up specfile

Browse Source 
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2011-01-19 10:39:22 +01:00
parent fd7089e44b
commit 4c5e4a4951
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util-linux.spec
View File

@ -2,7 +2,7 @@
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.19 Version: 2.19
Release: 0.1%{?dist} Release: 0.2%{?dist}
License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
@ -20,7 +20,7 @@ URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
### Macros ### Macros
%define floppyver 0.16 %define floppyver 0.16
%define cytune_archs %{ix86} alpha armv4l %define cytune_archs %{ix86} alpha %{arm}
### Dependences ### Dependences
BuildRequires: audit-libs-devel >= 1.0.6 BuildRequires: audit-libs-devel >= 1.0.6
@ -283,7 +283,7 @@ install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
# libtool junk # libtool junk
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
%ifarch sparc sparc64 sparcv9 %ifarch %{sparc}
rm -rf ${RPM_BUILD_ROOT}%{_bindir}/sunhostid rm -rf ${RPM_BUILD_ROOT}%{_bindir}/sunhostid
cat << E-O-F > ${RPM_BUILD_ROOT}%{_bindir}/sunhostid cat << E-O-F > ${RPM_BUILD_ROOT}%{_bindir}/sunhostid
#!/bin/sh #!/bin/sh
@ -337,7 +337,7 @@ done
%endif %endif
# unsupported on SPARCs # unsupported on SPARCs
%ifarch sparc sparcv9 sparc64 %ifarch %{sparc}
for I in /sbin/sfdisk \ for I in /sbin/sfdisk \
%{_mandir}/man8/sfdisk.8* \ %{_mandir}/man8/sfdisk.8* \
%doc fdisk/sfdisk.examples \ %doc fdisk/sfdisk.examples \
@ -440,12 +440,13 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
fi fi
fi fi
%if %{mtab_symlink} %if %{mtab_symlink}
ln -s /proc/mounts /etc/mtab rm -f /etc/mtab
/bin/chown root:root /etc/mtab ln -s /proc/mounts /etc/mtab
/bin/chown root:root /etc/mtab
%else %else
touch /etc/mtab touch /etc/mtab
/bin/chown root:root /etc/mtab /bin/chown root:root /etc/mtab
/bin/chmod 0644 /etc/mtab /bin/chmod 0644 /etc/mtab
%endif %endif
@ -670,7 +671,7 @@ fi
%{_mandir}/man8/tunelp.8* %{_mandir}/man8/tunelp.8*
%endif %endif
%ifnarch sparc sparcv9 sparc64 %ifnarch %{sparc}
%doc fdisk/sfdisk.examples %doc fdisk/sfdisk.examples
/sbin/cfdisk /sbin/cfdisk
/sbin/sfdisk /sbin/sfdisk
@ -678,7 +679,7 @@ fi
%{_mandir}/man8/sfdisk.8* %{_mandir}/man8/sfdisk.8*
%endif %endif
%ifarch sparc sparc64 sparcv9 %ifarch %{sparc}
%{_bindir}/sunhostid %{_bindir}/sunhostid
%endif %endif
@ -751,6 +752,9 @@ fi
%changelog %changelog
* Wed Jan 19 2011 Karel Zak <kzak@redhat.com> 2.19-0.2
- clean up specfile (review #667416)
* Wed Jan 5 2011 Karel Zak <kzak@redhat.com> 2.19-0.1 * Wed Jan 5 2011 Karel Zak <kzak@redhat.com> 2.19-0.1
- upgrade to the release 2.19-rc1 - upgrade to the release 2.19-rc1
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ReleaseNotes ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ReleaseNotes
@ -2139,7 +2143,7 @@ acquisition of controlling terminal).
* Thu Mar 25 1999 Jeff Johnson <jbj@redhat.com> * Thu Mar 25 1999 Jeff Johnson <jbj@redhat.com>
- include sfdisk (#1164) - include sfdisk (#1164)
- fix write (#1784) - fix write (#1784)
- use positive logic in spec file (%%ifarch rather than %ifnarch). - use positive logic in spec file (ifarch rather than ifnarch).
- (re)-use 1st matching utmp slot if search by mypid not found. - (re)-use 1st matching utmp slot if search by mypid not found.
- update to 2.9o - update to 2.9o
- lastb wants bad logins in wtmp clone /var/run/btmp (#884) - lastb wants bad logins in wtmp clone /var/run/btmp (#884)