-%attr(755,root,root) %{_libdir}/evolution/%{basever}/evolution-alarm-notify
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/killev
-%dir %{_libdir}/evolution/%{basever}/modules
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-composer-autosave.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-contact-photos.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-gravatar.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-offline-alert.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-plugin-lib.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-plugin-manager.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-settings.so
-%attr(755,root,root) %{_libdir}/evolution/%{basever}/modules/module-web-inspector.so
+
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/evolution
+%endif
+%attr(755,root,root) %{_libexecdir}/evolution/killev
+
+%dir %{_libdir}/evolution/modules
+%attr(755,root,root) %{_libdir}/evolution/modules/module-accounts-window.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-composer-autosave.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-composer-to-meeting.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-config-lookup.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-contact-photos.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-gravatar.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-offline-alert.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-plugin-lib.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-plugin-manager.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-settings.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-webkit-editor.so
+%attr(755,root,root) %{_libdir}/evolution/modules/module-webkit-inspector.so
+%dir %{_libdir}/evolution/web-extensions
+%attr(755,root,root) %{_libdir}/evolution/web-extensions/libewebextension.so
+%dir %{_libdir}/evolution/web-extensions/webkit-editor
+%attr(755,root,root) %{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
+%dir %{_libdir}/evolution-data-server/ui-modules
+%attr(755,root,root) %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
+
+%dir %{_datadir}/evolution
+%dir %{_datadir}/evolution/etspec
+%dir %{_datadir}/evolution/views
+
+%dir %{_datadir}/evolution/default
+%dir %{_datadir}/evolution/default/C
+%lang(ca) %dir %{_datadir}/evolution/default/ca
+%lang(cs) %dir %{_datadir}/evolution/default/cs
+%lang(de) %dir %{_datadir}/evolution/default/de
+%lang(es) %dir %{_datadir}/evolution/default/es
+%lang(fi) %dir %{_datadir}/evolution/default/fi
+%lang(fr) %dir %{_datadir}/evolution/default/fr
+%lang(hu) %dir %{_datadir}/evolution/default/hu
+%lang(id) %dir %{_datadir}/evolution/default/id
+%lang(it) %dir %{_datadir}/evolution/default/it
+%lang(ko) %dir %{_datadir}/evolution/default/ko
+%lang(lt) %dir %{_datadir}/evolution/default/lt
+%lang(mk) %dir %{_datadir}/evolution/default/mk
+%lang(nl) %dir %{_datadir}/evolution/default/nl
+%lang(pl) %dir %{_datadir}/evolution/default/pl
+%lang(pt) %dir %{_datadir}/evolution/default/pt
+%lang(ro) %dir %{_datadir}/evolution/default/ro
+%lang(sv) %dir %{_datadir}/evolution/default/sv
+%lang(sr) %dir %{_datadir}/evolution/default/sr
+%lang(sr@latin) %dir %{_datadir}/evolution/default/sr@latin
+%lang(zh_CN) %dir %{_datadir}/evolution/default/zh_CN
+
+%{_datadir}/evolution/address_formats.dat
+%{_datadir}/evolution/countrytransl.map
+
+%dir %{_datadir}/evolution/errors
+%{_datadir}/evolution/errors/e-system.error
+%{_datadir}/evolution/errors/filter.error
+%{_datadir}/evolution/errors/mail-composer.error
+%{_datadir}/evolution/errors/shell.error
+%{_datadir}/evolution/errors/evolution-offline-alert.error
+%{_datadir}/evolution/errors/widgets.error
+
+%{_datadir}/evolution/icons
+%{_datadir}/evolution/images
+%{_datadir}/evolution/sounds
+%{_datadir}/evolution/ui
+%{_datadir}/evolution/webkit