- todo note about calc.desktop

[packages/libreoffice.git] / libreoffice.spec

diff --git a/libreoffice.spec b/libreoffice.spec
index 09e72d34ab257d6060d318dcea5e9270a15e3024..ec2aa90400a7876e1a695f20f0091f07cab08265 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -23,6 +23,7 @@
 #      - --with-system-mythes + mythes package (http://lingucomponent.openoffice.org/thesaurus.html)
 #   - --with-system-mspack - use libmspack already installed on system
 #      - bcond system_xt doesn't work - xt in PLD is too old or broken
+#   - rename %_desktopdir/calc.desktop (conflicts with calc)
 #
 #      $ grep SYSTEM ooo-build-ooe680-m6/build/ooe680-m6/config_office/config.log |grep NO
 #
@@ -72,7 +73,7 @@
 %define                tag                     %(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define                milestone       m14
 %define                _tag            %(echo %{tag} | tr - _)
-%define                _rel            0.5
+%define                _rel            0.6
 
 Summary:       OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):     OpenOffice.org - potężny pakiet biurowy
@@ -2299,7 +2300,7 @@ fi
 
 %install
 if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
-       rm -rf $RPM_BUILD_ROOT makeinstall.stamp installed.stamp
+       rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
 
        # limit to single process installation, it's safe at least
        %{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
@@ -2486,7 +2487,7 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre core
+%pretrans core
 %if %{with system_myspell}
 # we symlink the dir, unless smb wishes to patch OOo to use system dir directly
 if [ -d %{_libdir}/%{name}/share/dict/ooo ] && [ ! -L %{_libdir}/%{name}/share/dict/ooo ]; then