From 4cf12097d74417acef9da64b036cfd71c2398c79 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 28 Mar 2007 17:27:00 +0000 Subject: [PATCH] - AC-branch merge Changed files: libreoffice.spec -> 1.751 --- libreoffice.spec | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f7a0bb2..d6ec2a9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2189,7 +2189,7 @@ CONFOPTS="\ %endif --with-dynamic-xinerama \ --with-intro-bitmaps="\$SRCDIR/openintro_pld.bmp" \ - --with-about-bitmaps="\$SRCDIR/openabout_pld.png" \ + --with-about-bitmaps="\$SRCDIR/openabout_pld.bmp" \ --with-distro="${DISTRO}" \ --enable-gtk \ --%{!?with_kde:dis}%{?with_kde:en}able-kde \ @@ -2279,7 +2279,7 @@ fi %install if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then - rm -rf $RPM_BUILD_ROOT makeinstall.stamp + rm -rf $RPM_BUILD_ROOT makeinstall.stamp installed.stamp # limit to single process installation, it's safe at least %{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup @@ -2362,14 +2362,14 @@ if [ ! -f installed.stamp ]; then mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share # more non-archidecture dependant nature data + %if %{with java} mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help + %endif mv $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../share/%{name}/licenses $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name} ln -s ../../share/%{name}/readmes $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes - mv $RPM_BUILD_ROOT%{_libdir}/%{name}/presets $RPM_BUILD_ROOT%{_datadir}/%{name} - ln -s ../../share/%{name}/presets $RPM_BUILD_ROOT%{_libdir}/%{name}/presets # fix python sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g' $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py @@ -2459,7 +2459,6 @@ done %{__sed} -i -e ' s,%{_libdir}/%{name}/help,%{_datadir}/%{name}/help,; s,%{_libdir}/%{name}/licenses,%{_datadir}/%{name}/licenses,; - s,%{_libdir}/%{name}/presets,%{_datadir}/%{name}/presets,; s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,; s,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,; ' *.lang @@ -2474,12 +2473,15 @@ if [ -d %{_libdir}/%{name}/share/dict/ooo ] && [ ! -L %{_libdir}/%{name}/share/d rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v %{_libdir}/%{name}/share/dict/ooo{,.rpmsave} || : fi %endif -for d in presets share help readmes licenses; do +for d in share %{?with_java:help} readmes licenses; do if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then install -d %{_datadir}/%{name} mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d || mv %{_libdir}/%{name}/$d{,.rpmsave} fi done +if [ -L %{_libdir}/%{name}/presets ]; then + rm -f %{_libdir}/%{name}/presets +fi %post core %update_mime_database @@ -2894,23 +2896,22 @@ fi %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-math.xcu %{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-writer.xcu -%{_libdir}/%{name}/presets -%dir %{_datadir}/%{name}/presets -%dir %{_datadir}/%{name}/presets/autotext -%{_datadir}/%{name}/presets/autotext/mytexts.bau -%{_datadir}/%{name}/presets/basic -%dir %{_datadir}/%{name}/presets/config -%{_datadir}/%{name}/presets/config/autotbl.fmt -%{_datadir}/%{name}/presets/config/cmyk.soc -%{_datadir}/%{name}/presets/config/gallery.soc -%{_datadir}/%{name}/presets/config/html.soc -%{_datadir}/%{name}/presets/config/standard.so? -%{_datadir}/%{name}/presets/config/sun-color.soc -%{_datadir}/%{name}/presets/config/web.soc - -%{_datadir}/%{name}/presets/database -%{_datadir}/%{name}/presets/gallery -%{_datadir}/%{name}/presets/psprint +%dir %{_libdir}/%{name}/presets +%dir %{_libdir}/%{name}/presets/autotext +%{_libdir}/%{name}/presets/autotext/mytexts.bau +%{_libdir}/%{name}/presets/basic +%dir %{_libdir}/%{name}/presets/config +%{_libdir}/%{name}/presets/config/autotbl.fmt +%{_libdir}/%{name}/presets/config/cmyk.soc +%{_libdir}/%{name}/presets/config/gallery.soc +%{_libdir}/%{name}/presets/config/html.soc +%{_libdir}/%{name}/presets/config/standard.so? +%{_libdir}/%{name}/presets/config/sun-color.soc +%{_libdir}/%{name}/presets/config/web.soc + +%{_libdir}/%{name}/presets/database +%{_libdir}/%{name}/presets/gallery +%{_libdir}/%{name}/presets/psprint # Programs %attr(755,root,root) %{_bindir}/ooconfig @@ -3040,7 +3041,7 @@ fi %{_mandir}/man1/openoffice.1* # en-US -%{_datadir}/%{name}/presets/config/*_en-US.so* +%{_libdir}/%{name}/presets/config/*_en-US.so* %{_datadir}/%{name}/share/autocorr/acor_*.dat %{_datadir}/%{name}/share/autotext/en-US %{_datadir}/%{name}/share/registry/res/en-US -- 2.44.0