diff --git a/eds-python3.patch b/eds-python3.patch
new file mode 100644
index 0000000..3daaf6e
--- /dev/null
+++ b/eds-python3.patch
@@ -0,0 +1,13 @@
+Index: evolution-data-server-3.26.5/CMakeLists.txt
+===================================================================
+--- evolution-data-server-3.26.5.orig/CMakeLists.txt
++++ evolution-data-server-3.26.5/CMakeLists.txt
+@@ -296,7 +296,7 @@ if(NOT PERL)
+ 	message(FATAL_ERROR "You need perl to build ${PROJECT_NAME}")
+ endif(NOT PERL)
+ 
+-find_program(PYTHON python)
++find_program(PYTHON python3 python2 python)
+ if(NOT PYTHON)
+ 	message(FATAL_ERROR "You need python to build ${PROJECT_NAME}")
+ endif(NOT PYTHON)
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 0f4be4a..2d2b8b0 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Feb 15 10:54:50 UTC 2018 - tchvatal@suse.com
+
+- Format with spec-cleaner
+- Move license to %license tag
+- Allow building with python3 instead of python2:
+  + eds-python3.patch
+- Drop obsolete obsoletes for 64bit and 32bit packages
+
 -------------------------------------------------------------------
 Mon Feb  5 13:17:05 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 36a1c01..e77d1e0 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -17,7 +17,6 @@
 
 
 %define with_introspection 1
-
 # Shared Library soNUMs, to make it easier for updates
 # When updating the sonums, do not forget to also update baselibs.conf
 %define so_camel 60
@@ -29,9 +28,8 @@
 %define so_edata_book 25
 %define so_ecal 19
 %define so_edata_cal 28
-
-Name:           evolution-data-server
 %define _evo_version 3.26
+Name:           evolution-data-server
 Version:        3.26.5
 Release:        0
 Summary:        Evolution Data Server
@@ -40,6 +38,8 @@ Group:          Development/Libraries/GNOME
 Url:            http://www.gnome.org
 Source0:        http://download.gnome.org/sources/evolution-data-server/3.26/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM eds-python3.patch tchvatal@suse.com -- Allow selection of py3 py2 and py to work with py3 only
+Patch0:         eds-python3.patch
 BuildRequires:  cmake
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -58,11 +58,10 @@ BuildRequires:  libsoup-devel >= 2.42
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  openldap2-devel
-BuildRequires:  python-devel
+BuildRequires:  pkgconfig
+# For adresbook data generating
+BuildRequires:  python3-base
 BuildRequires:  sqlite3-devel >= 3.7.17
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
 BuildRequires:  vala >= 0.22.0
 BuildRequires:  pkgconfig(gcr-base-3) >= 3.4
 BuildRequires:  pkgconfig(goa-1.0) >= 3.8
@@ -73,17 +72,12 @@ BuildRequires:  pkgconfig(libsecret-unstable) >= 0.5
 BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.11.91
 Requires:       mozilla-nss
 Recommends:     %{name}-lang = %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      evolution-data-server-64bit
-%endif
-%ifarch  %ix86 ppc
-Obsoletes:      evolution-data-server-32bit
-%endif
 # typelib-1_0-ECalendar-1_2 was dropped with e-d-s 3.7.3 due to libical not being introspecatble.
 Obsoletes:      typelib-1_0-ECalendar-1_2 <= %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?glib2_gsettings_schema_requires}
+%if !0%{?is_opensuse}
+BuildRequires:  translation-update-upstream
+%endif
 
 %description
 Evolution Data Server provides a central location for your address book
@@ -150,7 +144,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library for address book backends.
 
 %if %{?with_introspection}
-
 %package -n typelib-1_0-Camel-1_2
 Summary:        Evolution Data Server - Messaging Library, Introspection bindings
 Group:          System/Libraries
@@ -196,7 +189,6 @@ This package contains a shared system library for calendar backends.
 
 %package -n libedataserver-1_2-%{so_edataserver}
 Summary:        Evolution Data Server - Utilities Library
-# libedataserver references the gsettings schemas, which live in e-d-s package
 Group:          System/Libraries
 Requires:       %{name} >= %{version}
 
@@ -217,7 +209,6 @@ and calendar in the GNOME Desktop.
 This package contains a shared system library.
 
 %if %{?with_introspection}
-
 %package -n typelib-1_0-EDataServer-1_2
 Summary:        Evolution Data Server - Utilities Library, Introspection bindings
 Group:          System/Libraries
@@ -254,6 +245,7 @@ Requires:       libedata-book-1_2-%{so_edata_book} = %{version}
 Requires:       libedata-cal-1_2-%{so_edata_cal} = %{version}
 Requires:       libedataserver-1_2-%{so_edataserver} = %{version}
 Requires:       libedataserverui-1_2-%{so_edataserverui} = %{version}
+Requires:       openldap2-devel
 %if %{?with_introspection}
 Requires:       typelib-1_0-Camel-1_2 = %{version}
 Requires:       typelib-1_0-EBook-1_2 = %{version}
@@ -261,7 +253,6 @@ Requires:       typelib-1_0-EBookContacts-1_2 = %{version}
 Requires:       typelib-1_0-EDataServer-1_2 = %{version}
 Requires:       typelib-1_0-EDataServerUI-1_2 = %{version}
 %endif
-Requires:       openldap2-devel
 
 %description devel
 The Evolution Data Server development files provide the necessary
@@ -281,8 +272,10 @@ and calendar in the GNOME Desktop.
 This package contains developer documentation.
 
 %lang_package
+
 %prep
 %setup -q
+%patch0 -p1
 %if !0%{?is_opensuse}
 translation-update-upstream
 %endif
@@ -302,7 +295,7 @@ translation-update-upstream
   -DENABLE_VALA_BINDINGS=OFF \
   -DENABLE_INTROSPECTION=OFF \
 %endif
-  %nil
+  %{nil}
 make %{?_smp_mflags}
 
 %install
@@ -311,44 +304,27 @@ make %{?_smp_mflags}
 %fdupes %{buildroot}
 
 %post -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig
-
 %postun -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig
-
 %post -n libebackend-1_2-%{so_ebackend} -p /sbin/ldconfig
-
 %postun -n libebackend-1_2-%{so_ebackend} -p /sbin/ldconfig
-
 %post -n libebook-1_2-%{so_ebook} -p /sbin/ldconfig
-
 %postun -n libebook-1_2-%{so_ebook} -p /sbin/ldconfig
-
 %post -n libebook-contacts-1_2-%{so_ebook_contacts} -p /sbin/ldconfig
-
 %postun -n libebook-contacts-1_2-%{so_ebook_contacts} -p /sbin/ldconfig
-
 %post -n libecal-1_2-%{so_ecal} -p /sbin/ldconfig
-
 %postun -n libecal-1_2-%{so_ecal} -p /sbin/ldconfig
-
 %post -n libedata-book-1_2-%{so_edata_book} -p /sbin/ldconfig
-
 %postun -n libedata-book-1_2-%{so_edata_book} -p /sbin/ldconfig
-
 %post -n libedata-cal-1_2-%{so_edata_cal} -p /sbin/ldconfig
-
 %postun -n libedata-cal-1_2-%{so_edata_cal} -p /sbin/ldconfig
-
 %post -n libedataserver-1_2-%{so_edataserver} -p /sbin/ldconfig
-
 %postun -n libedataserver-1_2-%{so_edataserver} -p /sbin/ldconfig
-
 %post -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig
-
 %postun -n libedataserverui-1_2-%{so_edataserverui} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc COPYING ChangeLog NEWS TODO
+%license COPYING
+%doc ChangeLog NEWS TODO
 %{_datadir}/evolution-data-server/
 %{_datadir}/GConf/gsettings/evolution-data-server.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
@@ -370,69 +346,52 @@ make %{?_smp_mflags}
 %{_userunitdir}/evolution-user-prompter.service
 
 %files -n libcamel-1_2-%{so_camel}
-%defattr(-, root, root)
 %{_libdir}/libcamel-1.2.so.%{so_camel}*
 
 %files -n libebackend-1_2-%{so_ebackend}
-%defattr(-, root, root)
 %{_libdir}/libebackend-1.2.so.%{so_ebackend}*
 
 %files -n libebook-1_2-%{so_ebook}
-%defattr(-, root, root)
 %{_libdir}/libebook-1.2.so.%{so_ebook}*
 
 %files -n libebook-contacts-1_2-%{so_ebook_contacts}
-%defattr(-, root, root)
 %{_libdir}/libebook-contacts-1.2.so.%{so_ebook_contacts}*
 
 %files -n libecal-1_2-%{so_ecal}
-%defattr(-, root, root)
 %{_libdir}/libecal-1.2.so.%{so_ecal}*
 
 %files -n libedata-book-1_2-%{so_edata_book}
-%defattr(-, root, root)
 %{_libdir}/libedata-book-1.2.so.%{so_edata_book}*
 
 %if %{?with_introspection}
-
 %files -n typelib-1_0-Camel-1_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/Camel-1.2.typelib
 
 %files -n typelib-1_0-EBook-1_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/EBook-1.2.typelib
 
 %files -n typelib-1_0-EBookContacts-1_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/EBookContacts-1.2.typelib
 %endif
 
 %files -n libedata-cal-1_2-%{so_edata_cal}
-%defattr(-, root, root)
 %{_libdir}/libedata-cal-1.2.so.%{so_edata_cal}*
 
 %files -n libedataserver-1_2-%{so_edataserver}
-%defattr(-, root, root)
 %{_libdir}/libedataserver-1.2.so.%{so_edataserver}*
 
 %files -n libedataserverui-1_2-%{so_edataserverui}
-%defattr(-, root, root)
 %{_libdir}/libedataserverui-1.2.so.%{so_edataserverui}*
 
 %if %{?with_introspection}
-
 %files -n typelib-1_0-EDataServer-1_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/EDataServer-1.2.typelib
 
 %files -n typelib-1_0-EDataServerUI-1_2
-%defattr(-, root, root)
 %{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
 %endif
 
 %files devel
-%defattr(-, root, root)
 %{_includedir}/evolution-data-server/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -445,7 +404,6 @@ make %{?_smp_mflags}
 %endif
 
 %files doc
-%defattr(-, root, root)
 %{_datadir}/gtk-doc/html/*
 
 %files lang -f evolution-data-server.lang