summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-11-01 14:00:07 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-11-01 14:00:07 (GMT)
commit3ac392609782d7c57ce3e0e44457244643361d63 (patch)
tree48c1382094ce0352dbfccc3ae8aa82c3206a8f5d
parent46884732b48f8ffb8d3c9b17c2e163f31a6eb4db (diff)
downloadpykolab-3ac392609782d7c57ce3e0e44457244643361d63.tar.gz
Avoid conflict between pykolab and kolabd over /usr/sbin/kolab-conf
-rw-r--r--configure.ac2
-rw-r--r--pykolab.spec.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index d062dc4..be1ed2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.2.1)
+AC_INIT([pykolab], 0.2.2)
AC_SUBST([RELEASE], 1)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
diff --git a/pykolab.spec.in b/pykolab.spec.in
index c3eb2ce..d2ceb9d 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -145,7 +145,7 @@ rm -rf %{buildroot}
%doc AUTHORS ChangeLog COPYING README README.tests
%{_bindir}/*
%{_sbindir}/kolab
-%{_sbindir}/kolab-conf
+%exclude %{_sbindir}/kolab-conf
%attr(0640,root,kolab) %config(noreplace) %{_sysconfdir}/kolab/kolab.conf
%dir %{python_sitelib}/pykolab/
%exclude %{python_sitelib}/pykolab/telemetry.*