[lorax][rhel7-branch/master][PATCH] Revert "Don't remove /usr/share/doc/anaconda." (#1072033)

Martin Kolman mkolman at redhat.com
Tue Oct 7 15:35:59 UTC 2014


The help content path has been changed to /usr/share/anaconda/help,
so this Lorax change is no longer needed.

This reverts commit 8bd3d8d232d978c4ab67642e9f4304fcae9a3842.

Resolves: rhbz#1072033
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 share/runtime-cleanup.tmpl | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 6cf195c..a5507b8 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -61,7 +61,7 @@ removepkg xorg-x11-server-common yum-utils
 ## other removals
 remove /boot /home /media /opt /srv /tmp/*
 remove /usr/etc /usr/games /usr/local /usr/tmp
-remove /usr/share/info /usr/share/man /usr/share/gnome
+remove /usr/share/doc /usr/share/info /usr/share/man /usr/share/gnome
 remove /usr/share/mime/application /usr/share/mime/audio /usr/share/mime/image
 remove /usr/share/mime/inode /usr/share/mime/message /usr/share/mime/model
 remove /usr/share/mime/multipart /usr/share/mime/packages /usr/share/mime/text
@@ -337,16 +337,6 @@ removefrom redhat-logos /usr/share/{plymouth,backgrounds}*
 removefrom subscription-manager --allbut /etc/rhsm/* /usr/share/rhsm/* /var/log/rhsm/* \
     /etc/yum/pluginconf.d/product-id.conf /usr/lib/yum-plugins/product-id.py
 
-## Remove everything from /usr/share/doc except for anaconda's help files.
-%if exists(root+"/usr/share/doc/anaconda"):
-    move ${root}/usr/share/doc/anaconda ${root}/usr/
-    remove ${root}/usr/share/doc
-    mkdir ${root}/usr/share/doc
-    move ${root}/usr/anaconda ${root}/usr/share/doc/
-%else:
-    remove ${root}/usr/share/doc
-%endif
-
 ## cleanup_python_files()
 runcmd find ${root} -name "*.pyo" -type f -delete
 runcmd find ${root} -name "*.pyc" -type f -exec ln -sf /dev/null {} \;
-- 
1.9.3



More information about the anaconda-patches mailing list