Hello community, here is the log from the commit of package util-linux checked in at Thu Jul 5 19:13:27 CEST 2007. -------- --- util-linux/util-linux.changes 2007-07-05 11:59:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2007-07-05 17:24:16.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jul 5 16:08:58 CEST 2007 - mkoenig@suse.de + +- use %config(noreplace) for /etc/filesystems +- Keep rdev stuff for x86_64 + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- removed patches (merged upstream) + util-linux-2.12r-misc_utils_cal_formatting.patch + util-linux-2.12q-sys_utils_ionice.patch + +------------------------------------------------------------------- Old: ---- util-linux-2.12q-sys_utils_ionice.patch util-linux-2.12r-misc_utils_cal_formatting.patch New: ---- util-linux-2.13-sys_utils_build_rdev_x86_64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.aT9321/_old 2007-07-05 19:12:33.000000000 +0200 +++ /var/tmp/diff_new_pack.aT9321/_new 2007-07-05 19:12:33.000000000 +0200 @@ -21,7 +21,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r+2.13rc1 -Release: 1 +Release: 2 %define upver 2.13-rc1 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2 @@ -59,8 +59,6 @@ Patch8: util-linux-2.12a-mount_procswapcheck.patch # 57097 (suse42097) - mount doesn't allow to mount files that have colons in their path Patch10: util-linux-2.12a-mount_mountpointwithcolon.patch -# add ionice -Patch14: util-linux-2.12q-sys_utils_ionice.patch # 104405 - mount -a doesn't work with hotpluggable devices Patch16: util-linux-mount_opt_hotplug.patch # 115129 - mount --move doesn't work as expected @@ -78,8 +76,6 @@ Patch29: util-linux-2.12r-fdisk_cyl.patch # 179122 - Fix readprofile one ppc64 Patch30: util-linux-2.12r-sys_utils_readprofile_mapfile.patch -# 203469 -Patch31: util-linux-2.12r-misc_utils_cal_formatting.patch # 205956 - default swap to V1 in any case Patch32: util-linux-2.12r-disk_utils_mkswap_fix.patch # 238687 - let mkfs tools open block devices with O_EXCL @@ -91,6 +87,7 @@ Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch Patch40: util-linux-2.13-sys_utils_arch.patch Patch44: util-linux-2.13-schedutils_chrt.patch +Patch45: util-linux-2.13-sys_utils_build_rdev_x86_64.patch ## ## adjtimex ## @@ -130,7 +127,6 @@ %patch6 %patch8 -p1 %patch10 -p1 -%patch14 -p1 %patch16 -p1 %patch18 %patch21 @@ -138,13 +134,13 @@ %patch26 %patch29 -p1 %patch30 -p1 -%patch31 %patch32 -p1 %patch34 -p1 %patch35 -p1 #%patch38 -p1 %patch40 -p1 %patch44 -p1 +%patch45 -p1 # cd adjtimex-* %patch50 -p1 @@ -372,7 +368,7 @@ %doc README.largedisk %config %attr(744,root,root) /etc/init.d/raw %config(noreplace) %attr(644,root,root) /etc/raw -%config /etc/filesystems +%config(noreplace) /etc/filesystems /usr/sbin/rcraw /bin/arch /bin/dmesg @@ -535,7 +531,7 @@ /sbin/cfdisk /sbin/sfdisk %endif -%ifarch %ix86 +%ifarch %ix86 x86_64 /usr/sbin/ramsize /usr/sbin/rdev /usr/sbin/rootflags @@ -582,6 +578,13 @@ %changelog * Thu Jul 05 2007 - mkoenig@suse.de +- use %%config(noreplace) for /etc/filesystems +- Keep rdev stuff for x86_64 + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- removed patches (merged upstream) + util-linux-2.12r-misc_utils_cal_formatting.patch + util-linux-2.12q-sys_utils_ionice.patch +* Thu Jul 05 2007 - mkoenig@suse.de - update to 2.13-rc1: * mount fixes * agetty: add 'O' escape code to display domain name ++++++ util-linux-2.13-sys_utils_arch.patch ++++++ --- /var/tmp/diff_new_pack.aT9321/_old 2007-07-05 19:12:33.000000000 +0200 +++ /var/tmp/diff_new_pack.aT9321/_new 2007-07-05 19:12:33.000000000 +0200 @@ -1,14 +1,14 @@ -Index: util-linux-ng-2.12r+git20070703/sys-utils/Makefile.am +Index: util-linux-ng-2.13-rc1/sys-utils/Makefile.am =================================================================== ---- util-linux-ng-2.12r+git20070703.orig/sys-utils/Makefile.am -+++ util-linux-ng-2.12r+git20070703/sys-utils/Makefile.am +--- util-linux-ng-2.13-rc1.orig/sys-utils/Makefile.am ++++ util-linux-ng-2.13-rc1/sys-utils/Makefile.am @@ -1,9 +1,11 @@ include $(top_srcdir)/config/include-Makefile.am -bin_PROGRAMS = dmesg +bin_PROGRAMS = arch dmesg - usrbinexec_PROGRAMS = cytune flock ionice ipcrm ipcs renice setsid setarch + usrbinexec_PROGRAMS = cytune flock ipcrm ipcs renice setsid setarch +arch_SOURCES = arch.c + @@ -19,15 +19,15 @@ tunelp_SOURCES = tunelp.c lp.h --man_MANS = flock.1 ionice.1 readprofile.1 \ -+man_MANS = arch.1 flock.1 ionice.1 readprofile.1 \ +-man_MANS = flock.1 readprofile.1 \ ++man_MANS = arch.1 flock.1 readprofile.1 \ ctrlaltdel.8 cytune.8 dmesg.1 ipcrm.1 ipcs.1 renice.1 \ setsid.1 tunelp.8 setarch.8 -Index: util-linux-ng-2.12r+git20070703/sys-utils/arch.1 +Index: util-linux-ng-2.13-rc1/sys-utils/arch.1 =================================================================== --- /dev/null -+++ util-linux-ng-2.12r+git20070703/sys-utils/arch.1 ++++ util-linux-ng-2.13-rc1/sys-utils/arch.1 @@ -0,0 +1,34 @@ +.\" arch.1 -- +.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) @@ -63,10 +63,10 @@ +.\" Then how come we get these i586 values? +.\" Well, the routine check_bugs() does system_utsname.machine[1] = '0' + x86; +.\" (called in init/main.c, defined in ./include/asm-i386/bugs.h) -Index: util-linux-ng-2.12r+git20070703/sys-utils/arch.c +Index: util-linux-ng-2.13-rc1/sys-utils/arch.c =================================================================== --- /dev/null -+++ util-linux-ng-2.12r+git20070703/sys-utils/arch.c ++++ util-linux-ng-2.13-rc1/sys-utils/arch.c @@ -0,0 +1,35 @@ +/* arch -- print machine architecture information + * Created: Mon Dec 20 12:27:15 1993 by faith@cs.unc.edu ++++++ util-linux-2.13-sys_utils_build_rdev_x86_64.patch ++++++ Index: util-linux-ng-2.13-rc1/sys-utils/Makefile.am =================================================================== --- util-linux-ng-2.13-rc1.orig/sys-utils/Makefile.am +++ util-linux-ng-2.13-rc1/sys-utils/Makefile.am @@ -26,6 +26,11 @@ usrsbinexec_PROGRAMS += rdev man_MANS += rdev.8 ramsize.8 rootflags.8 vidmode.8 RDEV_LINKS = ramsize vidmode rootflags endif +if ARCH_86_64 +usrsbinexec_PROGRAMS += rdev +man_MANS += rdev.8 ramsize.8 rootflags.8 vidmode.8 +RDEV_LINKS = ramsize vidmode rootflags +endif endif SETARCH_LINKS = linux32 linux64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org