[PATCH 1/3] Get rid of the useless modules directory

Vratislav Podzimek vpodzime at redhat.com
Tue Nov 19 15:10:06 UTC 2013


The modules directory is a remnant from the firstboot package that was used as a
skeleton for the intial-setup package.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 MANIFEST.in        | 1 -
 initial-setup.spec | 3 ---
 modules/README.txt | 0
 setup.py           | 3 +--
 4 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 modules/README.txt

diff --git a/MANIFEST.in b/MANIFEST.in
index 60d27e6..289576c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,5 @@ include Makefile
 recursive-include systemd *
 recursive-include scripts *
 recursive-include po *.po *.pot Makefile
-recursive-include modules *.py *.glade *.txt
 recursive-include initial_setup *.py *.glade *.txt
 recursive-exclude modules *.pyc *.pyo
diff --git a/initial-setup.spec b/initial-setup.spec
index 046e68b..3475b42 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -84,12 +84,9 @@ fi
 
 %files -f %{name}.lang
 %doc COPYING README
-%dir %{_datadir}/initial-setup/
-%dir %{_datadir}/initial-setup/modules/
 %{python_sitelib}/*
 %{_bindir}/initial-setup
 %{_bindir}/firstboot-windowmanager
-%{_datadir}/initial-setup/modules/*
 
 %{_unitdir}/initial-setup-graphical.service
 %{_unitdir}/initial-setup-text.service
diff --git a/modules/README.txt b/modules/README.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.py b/setup.py
index 1ec6317..c23092a 100644
--- a/setup.py
+++ b/setup.py
@@ -32,8 +32,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-data_files = [('/usr/lib/systemd/system', glob('systemd/*.service')),
-              ('/usr/share/initial-setup/modules', glob('modules/*'))]
+data_files = [('/usr/lib/systemd/system', glob('systemd/*.service'))]
 
 # add the firstboot start script for s390 architectures
 if os.uname()[4].startswith('s390'):
-- 
1.8.4.2



More information about the anaconda-patches mailing list