Accepting request 178855 from Base:System

- util-linux.spec: remove previously added "moving-su-trickery" again
  as a su-less coreutils packet is in Base:Build and Factory now. (forwarded request 178821 from bernhard-voelker)

OBS-URL: https://build.opensuse.org/request/show/178855
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=161

util-linux.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 12 21:02:28 UTC 2013 - mail@bernhard-voelker.de
+
+- util-linux.spec: remove previously added "moving-su-trickery" again
+  as a su-less coreutils packet is in Base:Build and Factory now.
+
 -------------------------------------------------------------------
 Fri Jun  7 00:13:25 UTC 2013 - mail@bernhard-voelker.de
 

util-linux.spec

@@ -26,16 +26,6 @@
 %bcond_without	enable_su
 %bcond_without	enable_eject
 
-# === MOVING SU TRICKERY (0/3) START ===
-# Work around su(1) PAM problems based on su(1) being provided by both the
-# coreutils and the util-linux package.  In the case the former is installed
-# first, the latter will save the config files as ".rpmnew".  When the new
-# su(1)-less coreutils package is then installed, the `trickery (tm)` symlinks
-# of the config files would then remain as dangling.
-# This "MOVING SU TRICKERY" consists of 3 parts: 1/3, 2/3 and 3/3.
-# This hack can go away when the new su-less coreutils package is out.
-# === MOVING SU TRICKERY (0/3) END ===
-
 Name:           util-linux
 BuildRequires:  audit-devel
 BuildRequires:  binutils-devel
@@ -321,13 +311,6 @@ install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-# === MOVING SU TRICKERY (1/3) START ===
-# Install a copy of the su(1) config files with .ul suffix.
-# This hack can go away when the new su-less coreutils package is out.
-install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su.ul
-install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l.ul
-install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su.ul
-# === MOVING SU TRICKERY (1/3) END ===
 %endif
 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
 pushd ../klogconsole
@@ -488,23 +471,6 @@ if [ -f etc/fstab ]; then
 	sed -i 's:code=:codepage=:' etc/fstab
 fi
 
-%posttrans
-%if "%{with enable_su}"
-# === MOVING SU TRICKERY (2/3) START ===
-# If su(1)'s PAM config files are symbolic links, then they have been installed
-# by the coreutils package (because su-enabled coreutils has been installed
-# before util-linux).  Remove the symlinks and install a copy of our .ul files
-# in their correct places.
-# This hack can go away when the new su-less coreutils package is out.
-for f in pam.d/su  pam.d/su-l  default/su ; do
-  if [ -L %{_sysconfdir}/$f -a -e %{_sysconfdir}/$f.ul ]; then
-    rm -v %{_sysconfdir}/$f
-    cp -av %{_sysconfdir}/$f.ul %{_sysconfdir}/$f
-  fi
-done
-# === MOVING SU TRICKERY (2/3) END ===
-%endif
-
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
 %{insserv_cleanup}
@@ -582,13 +548,6 @@ done
 %config(noreplace) %{_sysconfdir}/pam.d/su
 %config(noreplace) %{_sysconfdir}/pam.d/su-l
 %config(noreplace) %{_sysconfdir}/default/su
-# === MOVING SU TRICKERY (3/3) START ===
-# Package su(1) config files with .ul suffix needed in posttrans above.
-# This hack can go away when the new su-less coreutils package is out.
-%config %{_sysconfdir}/pam.d/su.ul
-%config %{_sysconfdir}/pam.d/su-l.ul
-%config %{_sysconfdir}/default/su.ul
-# === MOVING SU TRICKERY (3/3) END ===
 %endif
 #UsrMerge
 %if %{with enable_su}