From ca4e1e1328657f870ff2a14117d171dee468cbbd677a2fdff784064bced3bdc8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 18 Apr 2009 12:05:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=75 --- util-linux.changes | 6 ++++++ util-linux.spec | 25 ++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index e79bbcb..37bc572 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 16 14:55:22 CEST 2009 - werner@suse.de + +- Move /usr/sbin/adjtimex to /sbin/adjtimex to be able to check the + kernel time variables even without /usr mounted + ------------------------------------------------------------------- Mon Feb 16 12:35:00 CET 2009 - mkoenig@suse.de diff --git a/util-linux.spec b/util-linux.spec index 1d668bd..492413e 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -20,7 +20,7 @@ Name: util-linux BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel BuildRequires: libselinux-devel ncurses-devel pam-devel readline-devel zlib-devel -Url: http://kernel.org/pub/linux/utils/util-linux +Url: http://userweb.kernel.org/~kzak/util-linux-ng/ Provides: util rawio raw base schedutils Supplements: filesystem(minix) Obsoletes: util rawio raw base schedutils @@ -29,7 +29,7 @@ License: BSD 3-Clause; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.14.2 -Release: 2 +Release: 3 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 @@ -242,7 +242,7 @@ make check %install mkdir -p "$RPM_BUILD_ROOT"{/etc/init.d,%{_mandir}/man{1,8},\ /bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}} -cp adjtimex-*/adjtimex %{buildroot}/usr/sbin/ +cp adjtimex-*/adjtimex %{buildroot}/sbin/ cp adjtimex-*/adjtimex.8 %{buildroot}%{_mandir}/man8/ pushd .. # freeramdisk install @@ -399,11 +399,11 @@ fi %config %attr(744,root,root) /etc/init.d/raw %config(noreplace) %attr(644,root,root) /etc/raw %config(noreplace) /etc/filesystems -/usr/sbin/rcraw /bin/dmesg /bin/more /bin/mount /bin/umount +/sbin/adjtimex /sbin/agetty /sbin/blockdev /sbin/elvtune @@ -463,14 +463,14 @@ fi /usr/bin/which /usr/sbin/addpart /usr/sbin/delpart -/usr/sbin/ldattach /usr/sbin/freeramdisk +/usr/sbin/ldattach /usr/sbin/partx +/usr/sbin/rcraw /usr/sbin/rtcwake /usr/sbin/setctsid %verify(not mode) %attr(0755,root,tty) /usr/bin/wall /usr/bin/whereis -/usr/sbin/adjtimex %verify(not mode) %attr(0755,root,tty) /usr/bin/write %dir %{_defaultdocdir}/time %dir %{_defaultdocdir}/which @@ -625,6 +625,9 @@ fi #%endif %changelog +* Thu Apr 16 2009 werner@suse.de +- Move /usr/sbin/adjtimex to /sbin/adjtimex to be able to check the + kernel time variables even without /usr mounted * Mon Feb 16 2009 mkoenig@suse.de - remove util-linux-2.14.1-fdisk_cylinder.patch fixed upstream @@ -1141,7 +1144,7 @@ fi - Don't package manual executable [#114849] * Thu Sep 01 2005 mmj@suse.de - Add patch for device-mapper mount by label support [#75966] -* Wed Aug 31 2005 ro@suse.de +* Thu Sep 01 2005 ro@suse.de - provide and obsolete schedutils * Tue Aug 23 2005 hvogel@suse.de - update ionice patch by axboe so that ionice will complain about @@ -1601,7 +1604,7 @@ fi o mount updates * Tue Jul 23 2002 schwab@suse.de - Fix mkfs.cramfs for architectures with non-4k pages. -* Tue Jul 16 2002 mmj@suse.de +* Wed Jul 17 2002 mmj@suse.de - Merged base into util-linux * Mon Jul 15 2002 mmj@suse.de - Added JFSv2 patch from Christoph Hellwig for volume label. Does @@ -1674,7 +1677,7 @@ fi - Remove unneeded SPARC patch for hwclock * Sat Oct 13 2001 kukuk@suse.de - Update to util-linux 2.11l -* Tue Sep 11 2001 garloff@suse.de +* Wed Sep 12 2001 garloff@suse.de - Fixed some dutch translations. (bug #10276) * Mon Sep 10 2001 olh@suse.de - marry fdisk and AIX label again... @@ -1790,7 +1793,7 @@ fi * Fri Aug 25 2000 pthomas@suse.de - use %%{_mandir} and %%{_infodir} exclusively. This allows building from source rpm on platforms other than 7.0. -* Tue Jul 18 2000 bk@suse.de +* Wed Jul 19 2000 bk@suse.de - s390: removed dasdfmt and silo, %%ifnarch s390 for some non-s390 things. * Tue May 30 2000 bk@suse.de - added dasdfmt and silo on s390 @@ -1938,7 +1941,7 @@ fi - changed /local/bin/perl5 in chkdupexe to /usr/bin/perl * Fri Oct 31 1997 ro@suse.de - temporarily removed mount-hacker -* Wed Oct 29 1997 florian@suse.de +* Thu Oct 30 1997 florian@suse.de - add changes from ms@suse.de for hostid.c * Tue May 20 1997 florian@suse.de - only support kernel 2.0.x for nfs mounts, please use /bin/mount-hacker