diff --git a/libreoffice.spec b/libreoffice.spec index db659b3..9ed7e2c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -27,7 +27,6 @@ %define ooname libreoffice %define buildver %{version}.2 %define ooodir %{_libdir}/libreoffice -%define firefox_plugin libnpsoplugin.so %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-1.8.1 %define ccachedir ~/.ccache-OOo @@ -47,7 +46,7 @@ Version: 4.4.2 %if "%{beta}" != "" Release: 0.%{beta}.1 %else -Release: 2 +Release: 2.1 %endif License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office @@ -336,8 +335,6 @@ Requires: desktop-common-data >= 2008 Requires: sane-backends # Due to {_bindir}/paperconf # Requires: paper-utils -Requires(post,postun): desktop-file-utils -Requires(post,postun): update-alternatives # Upstream merged Conflicts: %{name}-core < %{EVRD} Obsoletes: %{name}-core < %{EVRD} @@ -361,25 +358,6 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{_libdir}/libreoffice/program/mailmerge.py -%post common -# Firefox plugin -if [ $1 -gt 1 ] -then - update-alternatives --remove %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so -fi -update-alternatives \ - --install %{_libdir}/mozilla/plugins/libnpsoplugin.so %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so 1 - -%postun common -# Firefox plugin -if [ $1 -eq 0 ] -then - update-alternatives --remove %{firefox_plugin} \ - %{ooodir}/program/libnpsoplugin.so -fi - #---------------------------------------------------------------------------- %package java