From 75f419273fb1727e003e0e30c48bf7833edaffa1 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Tue, 7 Oct 2014 17:41:20 +0200 Subject: [PATCH] Revert "Don't remove /usr/share/doc/anaconda." (#1072033) The help content path has been changed to /usr/share/anaconda/help, so this Lorax change is no longer needed. This reverts commit 2bd4637336edfdcb3bcccfb3dcc233517f8d5879 and commit 05ebf4ffcd066b08257938a748237d325381735a. --- 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 b2b05ac5..f8107ca6 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -62,7 +62,7 @@ removepkg xorg-x11-server-common yum-utils firewalld ## 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 @@ -329,16 +329,6 @@ removefrom ${product.name}-logos /etc/* removefrom ${product.name}-logos /usr/share/icons/{Bluecurve,oxygen}/* removefrom ${product.name}-logos /usr/share/{firstboot,gnome-screensaver,kde4,pixmaps}/* -## 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 {} \;