snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Activity

util-linux: fix conflicts in previous commit.

This commit is contained in:
Juan RP 2013-10-28 17:14:16 +01:00
parent 6a18d06008
commit 6283632f56
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
srcpkgs/util-linux/template
View File

@ -1,7 +1,7 @@
# Template file for 'util-linux' # Template file for 'util-linux'
pkgname=util-linux pkgname=util-linux
version=2.24 version=2.24
revision=2 revision=3
short_desc="Miscellaneous linux utilities" short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng" homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
@ -111,8 +111,6 @@ libuuid-devel_package() {
} }
util-linux_package() { util-linux_package() {
# nologin(8)
conflicts="shadow<4.1.5.1_14"
# Create uuidd system account for uuidd. # Create uuidd system account for uuidd.
system_accounts="uuidd" system_accounts="uuidd"
uuidd_homedir="/run/uuidd" uuidd_homedir="/run/uuidd"
@ -123,7 +121,7 @@ util-linux_package() {
/etc/pam.d/su /etc/pam.d/su
/etc/pam.d/su-l /etc/pam.d/su-l
/etc/pam.d/login" /etc/pam.d/login"
conflicts="chroot-util-linux>=0 coreutils<8.21_3" conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14"
replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
provides="eject-${version}" provides="eject-${version}"
depends="coreutils shadow>=4.1.5.1_3" depends="coreutils shadow>=4.1.5.1_3"