Kolab Groupware OBS

Changes of Revision 29

pykolab.spec Changed

@@ -2,21 +2,11 @@
 #!BuildIgnore:  systemd
 %endif
 
-<<<<<<< ./pykolab/pykolab.spec.mine
-
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global pyver 2
-%endif
-
-%{!?python_sitelib: %define python_sitelib %(python%{?pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-=======
-
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global py2 2
 %endif
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
->>>>>>> ./pykolab/pykolab.spec.r40
 
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
 %global with_systemd 1
@@ -80,32 +70,6 @@
 BuildRequires:      MySQL-python
 %endif
 
-<<<<<<< ./pykolab/pykolab.spec.mine
-BuildRequires:      python%{?pyver}
-BuildRequires:      python%{?pyver}-augeas
-BuildRequires:      python%{?pyver}-gnupg
-BuildRequires:      python-icalendar
-BuildRequires:      python%{?pyver}-kolab >= 2.0
-BuildRequires:      python%{?pyver}-kolabformat
-BuildRequires:      python%{?pyver}-ldap
-BuildRequires:      python%{?pyver}-nose
-BuildRequires:      python%{?pyver}-pep8
-BuildRequires:      python%{?pyver}-pyasn1
-BuildRequires:      python%{?pyver}-pyasn1-modules
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires:      python%{?pyver}-pytz
-%else
-BuildRequires:      pytz
-%endif
-BuildRequires:      python%{?pyver}-sievelib
-BuildRequires:      python%{?pyver}-sqlalchemy
-%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires:      python%{?pyver}-twisted
-%else
-BuildRequires:      python-twisted-core
-%endif
-BuildRequires:      python%{?pyver}-tzlocal
-=======
 BuildRequires:      python%{?py2}
 BuildRequires:      python%{?py2}-augeas
 BuildRequires:      python%{?py2}-gnupg
@@ -122,18 +86,11 @@
 BuildRequires:      python%{?py2}-sqlalchemy
 BuildRequires:      python%{?py2}-twisted
 BuildRequires:      python%{?py2}-tzlocal
->>>>>>> ./pykolab/pykolab.spec.r40
 
 Requires:           kolab-cli = %{version}-%{release}
-<<<<<<< ./pykolab/pykolab.spec.mine
-Requires:           python%{?pyver}-ldap >= 2.4
-Requires:           python%{?pyver}-pyasn1
-Requires:           python%{?pyver}-pyasn1-modules
-=======
 Requires:           python%{?py2}-ldap >= 2.4
 Requires:           python%{?py2}-pyasn1
 Requires:           python%{?py2}-pyasn1-modules
->>>>>>> ./pykolab/pykolab.spec.r40
 Requires(pre):      /usr/sbin/useradd
 Requires(pre):      /usr/sbin/usermod
 Requires(pre):      /usr/sbin/groupadd