Kolab Groupware OBS

Changes of Revision 3

pykolab.spec Changed

@@ -73,18 +73,30 @@
 BuildRequires:      future
 %endif
 
+
 BuildRequires:      gcc
 BuildRequires:      gettext
 BuildRequires:      glib2-devel
 BuildRequires:      intltool
 BuildRequires:      %{pythonmysql}
 BuildRequires:      python%{?py2}
-BuildRequires:      python%{?py2}-augeas
 BuildRequires:      python%{?py2}-gnupg
 BuildRequires:      python%{?py2}-icalendar
+%if 0%{?use_python3}
+BuildRequires:      python%{?py2}-ldap
+BuildRequires:      python%{?py2}-augeas
 BuildRequires:      python%{?py2}-kolab >= 2.0
 BuildRequires:      python%{?py2}-kolabformat
-BuildRequires:      python%{?py2}-ldap
+BuildRequires:      python%{?py2}-sqlalchemy
+BuildRequires:      python%{?py2}-tzlocal
+%else
+BuildRequires:      python-ldap
+BuildRequires:      python-augeas
+BuildRequires:      python-kolab >= 2.0
+BuildRequires:      python-kolabformat
+BuildRequires:      python-sqlalchemy
+BuildRequires:      python-tzlocal
+%endif
 BuildRequires:      python%{?py2}-nose
 BuildRequires:      python%{?py2}-pyasn1
 BuildRequires:      python%{?py2}-pyasn1-modules
@@ -93,15 +105,16 @@
 %else
 BuildRequires:      python%{?py2}-pytz
 %endif
-BuildRequires:      python%{?py2}-sievelib
 BuildRequires:      python%{?py2}-six
-BuildRequires:      python%{?py2}-sqlalchemy
 #FIXME only used for unittests
 #BuildRequires:      python%{?py2}-twisted-core
-BuildRequires:      python%{?py2}-tzlocal
 
 Requires:           kolab-cli = %{version}-%{release}
+%if 0%{?use_python3}
 Requires:           python%{?py2}-ldap >= 2.4
+%else
+Requires:           python%-ldap >= 2.4
+%endif
 Requires:           python%{?py2}-pyasn1
 Requires:           python%{?py2}-pyasn1-modules
 Requires:           python%{?py2}-six
@@ -167,9 +180,14 @@
 Summary:            Kolab CLI components
 Group:              Applications/System
 Requires:           %{name} = %{version}-%{release}
+%if 0%{?use_python3}
 Requires:           python{?py2}-augeas
-Requires:           python{?py2}-cheetah
 Requires:           python{?py2}-sqlalchemy
+%else
+Requires:           python-augeas
+Requires:           python-sqlalchemy
+%endif
+Requires:           python{?py2}-cheetah
 
 %description -n kolab-cli
 Kolab CLI utilities
@@ -183,7 +201,11 @@
 Requires:           %{name} = %{version}-%{release}
 Requires:           cyrus-sasl
 Requires:           cyrus-sasl-plain
+%if 0%{?use_python3}
 Requires:           python{?py2}-sqlalchemy
+%else
+Requires:           python-sqlalchemy
+%endif
 
 %description -n kolab-saslauthd
 Kolab SASL Authentication Daemon for multi-domain, multi-authn database deployments
@@ -210,7 +232,11 @@
 %endif
 Requires:           postfix
 Requires:           %{name} = %{version}-%{release}
+%if 0%{?use_python3}
 Requires:           python{?py2}-sqlalchemy
+%else
+Requires:           python-sqlalchemy
+%endif
 Requires:           %{pythonmysql}
 
 %description -n postfix-kolab
@@ -223,11 +249,16 @@
 Summary:            Kolab Content-Filter
 Group:              Applications/System
 Requires:           %{name} = %{version}-%{release}
+%if 0%{?use_python3}
 Requires:           python{?py2}-sqlalchemy
+Requires:           python{?py2}-tzlocal
+%else
+Requires:           python-sqlalchemy
+Requires:           python-tzlocal
+%endif
 Requires:           %{pythonmysql}
 Requires:           python{?py2}-gnupg
 Requires:           python{?py2}-icalendar >= 3.0
-Requires:           python{?py2}-tzlocal
 Requires:           %{name}-xml = %{version}-%{release}
 
 %description -n wallace
@@ -418,7 +449,7 @@
 fi
 
 %check
-nosetests -v tests/unit/ ||:
+nosetests -v tests/unit/
 
 %clean
 rm -rf %{buildroot}
@@ -455,7 +486,9 @@
 %exclude %{pykolab_python_sitelib}/kolab/
 %endif
 %{pykolab_python_sitelib}/cyruslib.py*
+%if 0%{?use_python3}
 %pycached %{pykolab_python_sitelib}/cyruslib.py
+%endif
 
 
 %attr(0775,kolab,kolab-n) %dir %{_localstatedir}/lib/kolab/