[packages/shadow] update current fileconflict list

glen glen at pld-linux.org
Mon May 12 15:39:23 CEST 2014


commit 81e44cba84eb2b762ab867b08e5d45aabae9cc3f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 12 16:39:11 2014 +0300

    update current fileconflict list

 shadow.spec | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/shadow.spec b/shadow.spec
index 57e16fd..91c6ee6 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,25 +1,22 @@
 # TODO
 # - handle conflicting files:
 #error: Install/Erase problems:
-#        file /usr/share/man/cs/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/de/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/fr/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/it/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/ja/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/ko/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /usr/share/man/pl/man1/groups.1.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package coreutils-8.20-2.x86_64
-#        file /sbin/nologin from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package util-linux-2.22.2-4.x86_64
-#        file /usr/share/man/man8/nologin.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package util-linux-2.22.2-4.x86_64
-#        file /usr/share/man/cs/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/fr/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/hu/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/it/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/ja/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/pl/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/ru/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/sv/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-13.x86_64
-#        file /usr/share/man/man8/lastlog.8.gz from install of shadow-4.1.5.1-0.1.x86_64 conflicts with file from package SysVinit-2.88-13.x86_64
+#        file /usr/share/man/fr/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /usr/share/man/it/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /usr/share/man/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /usr/share/man/pl/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /usr/share/man/ru/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /usr/share/man/sv/man8/lastlog.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package SysVinit-tools-2.88-17.x86_64
+#        file /sbin/nologin from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package util-linux-2.24.1-1.x86_64
+#        file /usr/share/man/man8/nologin.8.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package util-linux-2.24.1-1.x86_64
+#        file /usr/share/man/cs/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/de/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/fr/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/it/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/ja/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/ko/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
+#        file /usr/share/man/pl/man1/groups.1.gz from install of shadow-4.2.1-0.1.x86_64 conflicts with file from package coreutils-8.22-2.x86_64
 # - /etc/default/useradd is very outdated:
 # gpasswd -M chef_server chef_server
 #configuration error - unknown item 'FAILLOG_ENAB' (notify administrator)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/shadow.git/commitdiff/81e44cba84eb2b762ab867b08e5d45aabae9cc3f



More information about the pld-cvs-commit mailing list