summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-03-06 10:41:54 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-03-06 10:41:54 +0000
commit4daf6124d0a72fe8227d3b9e6035e7050e550f6b (patch)
treede582f7e51ec6c45cfab3e7822f4d604ce2f3e84
parent372eb6cdd8396be35bb86ec145c4881ff393c76b (diff)
downloadpykolab-4daf6124d0a72fe8227d3b9e6035e7050e550f6b.tar.gz
Update Makefiles
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac1
-rw-r--r--pykolab.spec.in32
-rw-r--r--pykolab/Makefile.am8
-rw-r--r--wallace/Makefile.am3
5 files changed, 50 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 0fbe791..434a5b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@ PYTHON_FILES = \
kolabd.py \
kolabtest.py \
saslauthd.py \
- setup-kolab.py
+ setup-kolab.py \
+ wallace.py
EXTRA_DIST = \
AUTHORS \
@@ -37,16 +38,13 @@ SUBDIRS = \
kolabd \
po \
pykolab \
- saslauthd
-
-tarball:
- git stash
- make dist
+ saslauthd \
+ wallace
ChangeLog:
(GIT_DIR=.git git log $(PACKAGE)-$(VERSION) > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
-srpm: ChangeLog tarball
+srpm: ChangeLog dist
@rpmbuild -ts $(PACKAGE)-$(VERSION).tar.gz
rpm: srpm
@@ -170,6 +168,7 @@ endif
$(INSTALL) -p -m 755 kolab.py $(DESTDIR)/$(sbindir)/kolab
$(INSTALL) -p -m 755 kolabd.py $(DESTDIR)/$(sbindir)/kolabd
$(INSTALL) -p -m 755 saslauthd.py $(DESTDIR)/$(sbindir)/kolab-saslauthd
+ $(INSTALL) -p -m 755 wallace.py $(DESTDIR)/$(sbindir)/wallaced
$(INSTALL) -p -m 755 kolabtest.py $(DESTDIR)/$(bindir)/kolab-test
$(INSTALL) -p -m 644 cyruslib.py $(DESTDIR)/$(pythondir)
$(INSTALL) -p -m 755 bin/kolab_parse_telemetry.py $(DESTDIR)/$(sbindir)/kolab_parse_telemetry
diff --git a/configure.ac b/configure.ac
index 8b73c68..1b4a92b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ po/Makefile.in
pykolab/constants.py
pykolab/Makefile
saslauthd/Makefile
+wallace/Makefile
])
AC_OUTPUT
diff --git a/pykolab.spec.in b/pykolab.spec.in
index 7b408b6..3752bac 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -96,6 +96,19 @@ Requires: MySQL-python
%description -n postfix-kolab
Kolab SMTP Access Policy for Postfix
+##
+## Wallace
+##
+%package -n wallace
+Summary: Kolab Content-Filter
+Group: Applications/System
+Requires: pykolab = %{version}-%{release}
+Requires: python-sqlalchemy
+Requires: MySQL-python
+
+%description -n wallace
+This is the Kolab Content Filter, with plugins
+
%prep
%setup -q
@@ -174,6 +187,19 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del kolabd
fi
+%post -n wallace
+if [ $1 -eq 1 ] ; then
+ chkconfig --add wallace
+else
+ /sbin/service wallace condrestart
+fi
+
+%preun -n wallace
+if [ $1 = 0 ]; then
+ /sbin/service wallace stop > /dev/null 2>&1
+ /sbin/chkconfig --del wallace
+fi
+
%clean
rm -rf %{buildroot}
@@ -247,6 +273,12 @@ rm -rf %{buildroot}
%doc AUTHORS ChangeLog COPYING
%{_libexecdir}/postfix/kolab_smtp_access_policy
+%files -n wallace
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING
+%{_sbindir}/wallaced
+%{python_sitelib}/wallace
+
%changelog
* @DATESTAMP@ Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> @VERSION@-@RELEASE@
- Initial package of new upstream version
diff --git a/pykolab/Makefile.am b/pykolab/Makefile.am
index 5e19d67..d9467a8 100644
--- a/pykolab/Makefile.am
+++ b/pykolab/Makefile.am
@@ -57,3 +57,11 @@ pykolab_testsdir = $(pythondir)/$(PACKAGE)/tests
pykolab_tests_PYTHON = \
$(wildcard tests/*.py)
+pykolab_tests_imapdir = $(pythondir)/$(PACKAGE)/tests/imap
+pykolab_tests_imap_PYTHON = \
+ $(wildcard tests/imap/*.py)
+
+pykolab_tests_wapdir = $(pythondir)/$(PACKAGE)/tests/wap
+pykolab_tests_wap_PYTHON = \
+ $(wildcard tests/wap/*.py)
+
diff --git a/wallace/Makefile.am b/wallace/Makefile.am
new file mode 100644
index 0000000..65f107c
--- /dev/null
+++ b/wallace/Makefile.am
@@ -0,0 +1,3 @@
+wallacedir = $(pythondir)/wallace
+wallace_PYTHON = $(wildcard *.py)
+