Update locations to install our python files

6 files changed, 24 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index 49eabb6..25b09fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,5 +159,5 @@ install-exec-local:
 	$(INSTALL) -p -m 755 kolabd.py $(DESTDIR)/$(sbindir)/kolabd
 	$(INSTALL) -p -m 644 saslauthd.py $(DESTDIR)/$(sbindir)/kolab-saslauthd
 	$(INSTALL) -p -m 755 kolabtest.py $(DESTDIR)/$(bindir)/kolab-test
-	$(INSTALL) -p -m 644 cyruslib.py $(DESTDIR)/$(datadir)/$(PACKAGE)/
+	$(INSTALL) -p -m 644 cyruslib.py $(DESTDIR)/$(pythondir)
 	$(INSTALL) -p -m 755 bin/kolab_smtp_access_policy.py $(DESTDIR)/$(libexecdir)/postfix/kolab_smtp_access_policy
diff --git a/configure.ac b/configure.ac
index 6da4591..105a968 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.1)
-AC_SUBST([RELEASE], 0.3)
+AC_SUBST([RELEASE], 0.4)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 
diff --git a/kolab/Makefile.am b/kolab/Makefile.am
index 0e30cc8..383d8f7 100644
--- a/kolab/Makefile.am
+++ b/kolab/Makefile.am
@@ -1,2 +1,2 @@
-kolabdir = $(datadir)/$(PACKAGE)/kolab
+kolabdir = $(pythondir)/kolab
 kolab_PYTHON = $(wildcard *.py)
diff --git a/kolabd/Makefile.am b/kolabd/Makefile.am
index 752cb3a..7d40cb0 100644
--- a/kolabd/Makefile.am
+++ b/kolabd/Makefile.am
@@ -1,2 +1,2 @@
-kolabddir = $(datadir)/$(PACKAGE)/kolabd
+kolabddir = $(pythondir)/kolabd
 kolabd_PYTHON = $(wildcard *.py)
diff --git a/pykolab.spec.in b/pykolab.spec.in
index 40075eb..20137af 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -85,17 +85,23 @@ rm -rf %{buildroot}
 %{_sbindir}/kolab
 %{_sbindir}/kolab-conf
 %config(noreplace) %{_sysconfdir}/kolab/kolab.conf
-%{_datadir}/pykolab/
+%{python_sitelib}/pykolab/
+%{python_sitelib}/kolab/
+%{python_sitelib}/cyruslib.py
+%{python_sitelib}/cyruslib.pyc
+%{python_sitelib}/cyruslib.pyo
 
 %files -n kolab-saslauthd
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_sbindir}/kolab-saslauthd
+%{python_sitelib}/saslauthd/
 
 %files -n kolab-server
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
 %{_sbindir}/kolabd
+%{python_sitelib}/kolabd/
 
 %files -n postfix-kolab
 %defattr(-,root,root,-)
diff --git a/pykolab/Makefile.am b/pykolab/Makefile.am
index 1846de7..f9f5009 100644
--- a/pykolab/Makefile.am
+++ b/pykolab/Makefile.am
@@ -1,45 +1,45 @@
-pykolabdir = $(datadir)/$(PACKAGE)
+pykolabdir = $(pythondir)/$(PACKAGE)
 pykolab_PYTHON = $(wildcard *.py)
 
-pykolab_authdir = $(datadir)/$(PACKAGE)/auth
+pykolab_authdir = $(pythondir)/$(PACKAGE)/auth
 pykolab_auth_PYTHON = \
 	auth/__init__.py
 
-pykolab_auth_ldapdir = $(datadir)/$(PACKAGE)/auth/ldap
+pykolab_auth_ldapdir = $(pythondir)/$(PACKAGE)/auth/ldap
 pykolab_auth_ldap_PYTHON = \
 	auth/ldap/__init__.py
 
-pykolab_clidir = $(datadir)/$(PACKAGE)/cli
+pykolab_clidir = $(pythondir)/$(PACKAGE)/cli
 pykolab_cli_PYTHON = \
 	cli/__init__.py
 
-pykolab_imapdir = $(datadir)/$(PACKAGE)/imap
+pykolab_imapdir = $(pythondir)/$(PACKAGE)/imap
 pykolab_imap_PYTHON = \
 	imap/__init__.py
 
-pykolab_pluginsdir = $(datadir)/$(PACKAGE)/plugins
+pykolab_pluginsdir = $(pythondir)/$(PACKAGE)/plugins
 pykolab_plugins_PYTHON = \
 	plugins/__init__.py
 
-pykolab_plugins_defaultfoldersdir = $(datadir)/$(PACKAGE)/plugins/defaultfolders
+pykolab_plugins_defaultfoldersdir = $(pythondir)/$(PACKAGE)/plugins/defaultfolders
 pykolab_plugins_defaultfolders_PYTHON = \
 	plugins/defaultfolders/__init__.py
 
-pykolab_plugins_dynamicquotadir = $(datadir)/$(PACKAGE)/plugins/dynamicquota
+pykolab_plugins_dynamicquotadir = $(pythondir)/$(PACKAGE)/plugins/dynamicquota
 pykolab_plugins_dynamicquota_PYTHON = \
 	plugins/dynamicquota/__init__.py
 
-pykolab_plugins_recipientpolicydir = $(datadir)/$(PACKAGE)/plugins/recipientpolicy
+pykolab_plugins_recipientpolicydir = $(pythondir)/$(PACKAGE)/plugins/recipientpolicy
 pykolab_plugins_recipientpolicy_PYTHON = \
 	plugins/recipientpolicy/__init__.py
 
-pykolab_setupdir = $(datadir)/$(PACKAGE)/setup
+pykolab_setupdir = $(pythondir)/$(PACKAGE)/setup
 pykolab_setup_PYTHON = \
-	setup/imap.py \
+	setup/imap_setup.py \
 	setup/__init__.py \
 	setup/ldap_setup.py
 
-pykolab_testsdir = $(datadir)/$(PACKAGE)/tests
+pykolab_testsdir = $(pythondir)/$(PACKAGE)/tests
 pykolab_setup_PYTHON = \
 	tests/calendar.py \
 	tests/constants.py \
@@ -48,7 +48,7 @@ pykolab_setup_PYTHON = \
 	tests/__init__.py \
 	tests/mail.py
 
-pykolab_tests_zpushdir = $(datadir)/$(PACKAGE)/tests/zpush
+pykolab_tests_zpushdir = $(pythondir)/$(PACKAGE)/tests/zpush
 pykolab_tests_zpush_PYTHON = \
 	tests/zpush/test_000_000.py \
 	tests/zpush/test_000_001.py \