summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-05-18 09:01:17 -0400
committerStephen Gallagher <sgallagh@redhat.com>2012-05-31 15:46:27 -0400
commit1467daed400d6c186bd0c99c057c42e764309ff3 (patch)
tree2e10d43032f193c51eacd3c7844ef773dd6fd758
parent0d492cf0d3bf44cac68e8606ac977da21f0628f6 (diff)
downloadsssd-1467daed400d6c186bd0c99c057c42e764309ff3.tar.gz
sssd-1467daed400d6c186bd0c99c057c42e764309ff3.tar.bz2
sssd-1467daed400d6c186bd0c99c057c42e764309ff3.zip
SSSDConfig: Make SSSDConfig a package
We were polluting the primary Python space with several dependencies. We will now install them their own directory/module.
-rw-r--r--Makefile.am6
-rw-r--r--contrib/sssd.spec.in2
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/config/SSSDConfig/__init__.py (renamed from src/config/SSSDConfig.py)0
-rw-r--r--src/config/SSSDConfig/ipachangeconf.py (renamed from src/config/ipachangeconf.py)0
-rw-r--r--src/config/SSSDConfig/sssd_upgrade_config.py (renamed from src/config/sssd_upgrade_config.py)0
-rw-r--r--src/config/setup.py6
7 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index e238b353..2b168ed1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,10 +185,10 @@ endif
dist_noinst_SCRIPTS = \
$(EXTRA_SCRIPTS) \
src/config/setup.py \
- src/config/ipachangeconf.py \
- src/config/SSSDConfig.py \
+ src/config/SSSDConfig/ipachangeconf.py \
+ src/config/SSSDConfig/__init__.py \
src/config/SSSDConfigTest.py \
- src/config/sssd_upgrade_config.py \
+ src/config/SSSDConfig/sssd_upgrade_config.py \
contrib/rhel/update_debug_levels.py \
src/tests/pyhbac-test.py
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 9972ebbd..8d7a8d5a 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -359,7 +359,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/sss_ssh_knownhostsproxy.1*
%endif
%{python_sitearch}/pysss.so
-%{python_sitelib}/*.py*
+%{python_sitelib}/SSSDConfig/*.py*
%files client
%defattr(-,root,root,-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 55dc6298..24da6c25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
# List of source files which contain translatable strings.
src/confdb/confdb_setup.c
-src/config/SSSDConfig.py
+src/config/SSSDConfig/__init__.py
src/monitor/monitor.c
src/providers/krb5/krb5_child.c
src/providers/ldap/ldap_child.c
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig/__init__.py
index 11da7cf2..11da7cf2 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig/__init__.py
diff --git a/src/config/ipachangeconf.py b/src/config/SSSDConfig/ipachangeconf.py
index ea73a9b9..ea73a9b9 100644
--- a/src/config/ipachangeconf.py
+++ b/src/config/SSSDConfig/ipachangeconf.py
diff --git a/src/config/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py
index e05226e8..e05226e8 100644
--- a/src/config/sssd_upgrade_config.py
+++ b/src/config/SSSDConfig/sssd_upgrade_config.py
diff --git a/src/config/setup.py b/src/config/setup.py
index 16cc5407..d3617e13 100644
--- a/src/config/setup.py
+++ b/src/config/setup.py
@@ -28,9 +28,5 @@ setup(
version='1',
license='GPLv3+',
url='http://fedorahosted.org/sssd',
- py_modules=[
- 'SSSDConfig',
- 'ipachangeconf',
- 'sssd_upgrade_config',
- ],
+ packages=['SSSDConfig'],
)