2 commits - bin/rebuild.sh.in pykolab.spec.in

[Jeroen van Meeuwen]

 bin/rebuild.sh.in |    3 ++-
 pykolab.spec.in   |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 51f4a07fd283b03edfa8ba983f14f3f56c58faa7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Apr 15 12:42:50 2013 +0100

    Exclude sieve script management plugin and command-line interface

diff --git a/pykolab.spec.in b/pykolab.spec.in
index f2a8a3c..65b595e 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -301,6 +301,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/pykolab/plugins/defaultfolders
 %{python_sitelib}/pykolab/plugins/dynamicquota
 %{python_sitelib}/pykolab/plugins/recipientpolicy
+# No sieve script management without our modified version of
+# python-sievelib
+%exclude %{python_sitelib}/pykolab/plugins/sievemgmt
 %{python_sitelib}/kolab/
 %{python_sitelib}/cyruslib.py*
 %attr(0775,kolab,kolab-n) %dir %{_localstatedir}/lib/kolab/
@@ -339,6 +342,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/pykolab/wap_client/*.py
 %{python_sitelib}/pykolab/wap_client/*.pyc
 %{python_sitelib}/pykolab/wap_client/*.pyo
+# No sieve script management without our modified version of
+# python-sievelib
+%exclude %{python_sitelib}/pykolab/cli/sieve
 
 %files -n kolab-saslauthd
 %defattr(-,root,root,-)


commit 010097c742c20ed3b2f98ebc9bbe430a2eebf074
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Apr 15 12:30:36 2013 +0100

    Update rebuild.sh.in

diff --git a/bin/rebuild.sh.in b/bin/rebuild.sh.in
index 4e2510d..d154d1a 100644
--- a/bin/rebuild.sh.in
+++ b/bin/rebuild.sh.in
@@ -13,9 +13,10 @@ declare -a product_series
 declare -a answers
 declare -a tasks
 
-dists[${#dists[@]}]='f16';  dist_tags[${#dist_tags[@]}]='fc16'; product_series[${#product_series[@]}]="3.0"
+#dists[${#dists[@]}]='f16';  dist_tags[${#dist_tags[@]}]='fc16'; product_series[${#product_series[@]}]="3.0"
 dists[${#dists[@]}]='f17';  dist_tags[${#dist_tags[@]}]='fc17'; product_series[${#product_series[@]}]="3.0"
 dists[${#dists[@]}]='el6';  dist_tags[${#dist_tags[@]}]='el6';  product_series[${#product_series[@]}]="3.0"
+dists[${#dists[@]}]='el6';  dist_tags[${#dist_tags[@]}]='el6';  product_series[${#product_series[@]}]="3.1"
 
 autoreconf -v && ./configure && make dist || exit 1