python-distutils-extra: fix installation.

diff --git a/config/rootfiles/packages/python-distutils-extra b/config/rootfiles/packages/python-distutils-extra
index 74d1a854c0360bf308a722f59341dcde11f59f02..1f0ddbe46237cac793fb196bb13c58f2a7ecb676 100644 (file)
--- a/config/rootfiles/packages/python-distutils-extra
+++ b/config/rootfiles/packages/python-distutils-extra
@@ -1,28 +1,20 @@
-#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg
-#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/__init__.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/__init__.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/auto.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/auto.pyc
-#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/__init__.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/__init__.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_extra.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_extra.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_help.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_help.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_i18n.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_i18n.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_icons.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/build_icons.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/clean_i18n.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/clean_i18n.pyc
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/pylint.py
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/DistUtilsExtra/command/pylint.pyc
-#usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/PKG-INFO
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/SOURCES.txt
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/dependency_links.txt
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/entry_points.txt
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/not-zip-safe
-usr/lib/python2.7/site-packages/python_distutils_extra-2.25-py2.7.egg/EGG-INFO/top_level.txt
+#usr/lib/python2.7/site-packages/DistUtilsExtra
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/auto.pyc
+#usr/lib/python2.7/site-packages/DistUtilsExtra/command
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/__init__.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_extra.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_help.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/build_icons.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/clean_i18n.pyc
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.py
+usr/lib/python2.7/site-packages/DistUtilsExtra/command/pylint.pyc

diff --git a/config/rootfiles/packages/python-xattr b/config/rootfiles/packages/python-xattr
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra
index ae1808564340db36b973a53b2a10e5d36aaf653f..f35b5819ebf2531cdc3199e8ba2ecd759cb5d0d1 100644 (file)
--- a/lfs/python-distutils-extra
+++ b/lfs/python-distutils-extra
@@ -78,5 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && python setup.py install
+       mv -f /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg/DistUtilsExtra \
+               /usr/lib/python2.7/site-packages/
+       rm -rf  /usr/lib/python2.7/site-packages/python_distutils_extra-$(VER)-py2.7.egg
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)