Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-06-02 07:02:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2014-05-22 20:39:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2014-06-02 07:02:20.000000000 +0200 @@ -1,0 +2,8 @@ +Tue May 27 21:17:40 UTC 2014 - sweet_f_a@gmx.de + +- use nologin from upstream (was added in 2.24) +- remove unknown configure options +- remove unused and outdated suse READMEs +- require bc for checks + +------------------------------------------------------------------- Old: ---- README.largedisk README.raw nologin.8 nologin.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.2URf9p/_old 2014-06-02 07:02:22.000000000 +0200 +++ /var/tmp/diff_new_pack.2URf9p/_new 2014-06-02 07:02:22.000000000 +0200 @@ -23,6 +23,7 @@ Name: util-linux BuildRequires: audit-devel +BuildRequires: bc BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel @@ -67,9 +68,6 @@ Group: System/Base Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz Source1: util-linux-rpmlintrc -# XXX: make nologin part of util-linux upstream -Source2: nologin.c -Source3: nologin.8 Source4: raw.init Source5: etc.raw Source6: etc_filesystems @@ -90,8 +88,6 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # -Source26: README.raw -Source30: README.largedisk Source50: uuidd.rc Source51: blkid.conf ## @@ -269,8 +265,6 @@ # # setctsid cp -p %{S:22} %{S:23} . -# nologin -cp -p %{S:2} %{S:3} %{S:26} %{S:30} . pushd ../klogconsole %patch55 -p1 @@ -318,8 +312,6 @@ --enable-raw \ --enable-write \ --enable-line \ - --enable-new-mount \ - --enable-login-utils \ --enable-tunelp \ --enable-socket-activation \ %if %{with enable_last} @@ -327,7 +319,6 @@ %else --disable-last \ %endif - --enable-logger \ %if %{with enable_eject} --enable-eject \ %else @@ -355,7 +346,6 @@ # make %{?_smp_mflags} # -%{__cc} -fwhole-program %{optflags} -o nologin nologin.c %{__cc} -fwhole-program %{optflags} -o mkzimage_cmdline %{S:29} %{__cc} -fwhole-program %{optflags} -o chrp-addnote %{SOURCE31} @@ -388,6 +378,7 @@ # util-linux install # %make_install +rm -f %{buildroot}/%{_libdir}/lib*.la #UsrMerge %if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin @@ -414,6 +405,7 @@ ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin ln -s %{_sbindir}/mkswap %{buildroot}/sbin +ln -s %{_sbindir}/nologin %{buildroot}/sbin ln -s %{_sbindir}/pivot_root %{buildroot}/sbin ln -s %{_sbindir}/raw %{buildroot}/sbin ln -s %{_sbindir}/sfdisk %{buildroot}/sbin @@ -430,19 +422,11 @@ ln -s %{_sbindir}/chcpu %{buildroot}/sbin #EndUsrMerge install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems -install -m 755 nologin %{buildroot}/%{_sbindir} -#UsrMerge -ln -s %{_sbindir}/nologin %{buildroot}/sbin -#EndUsrMerge -rm -f %{buildroot}/%{_libdir}/libblkid.la -rm -f %{buildroot}/%{_libdir}/libuuid.la -rm -f %{buildroot}/%{_libdir}/libmount.la %ifnarch ppc ppc64 install -m 755 mkzimage_cmdline %{buildroot}/%{_bindir} install -m 644 %{S:28} %{buildroot}%{_mandir}/man8 install -m 755 chrp-addnote %{buildroot}/%{_bindir} %endif -install -m 644 nologin.8 %{buildroot}%{_mandir}/man8 # setctsid install install -m 755 setctsid %{buildroot}/%{_sbindir} install -m 444 setctsid.8 %{buildroot}%{_mandir}/man8/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org