diff --git a/libreoffice.spec b/libreoffice.spec index c4452f2..3662e40 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -357,7 +357,6 @@ This package contains the application-independent files of LibreOffice. %{_mandir}/man1/unopkg.1* %{_libdir}/libreoffice/program/classes/ScriptProviderForBeanShell.jar %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb -%{_libdir}/libreoffice/program/mailmerge.py #---------------------------------------------------------------------------- @@ -533,6 +532,8 @@ and sounds. Summary: Python bindings for UNO library Group: Office Requires: %{name}-common = %{EVRD} +# mailmerge.py was packaged in libreoffice-common by mistake +Conflicts: %{name}-common < 1:4.4.7 Conflicts: %{name}-mailmerge < %{EVRD} Obsoletes: %{name}-mailmerge < %{EVRD}