[libreoffice/f16] hate pagein, but can't fight the tide

Caolan McNamara caolanm at fedoraproject.org
Mon Oct 3 12:24:04 UTC 2011


commit a090aadb6a8da8992df3ad59009a49d64ff3a7ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 3 13:21:21 2011 +0100

    hate pagein, but can't fight the tide

 libreoffice.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index c5a34e4..0516679 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1137,9 +1137,6 @@ cat sh.filelist >> sr.filelist
 #remove it in case we didn't build with gcj
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/classes/sandbox.jar
 
-#remove pagein stuff
-rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/pagein*
-
 #remove dummy .dat files
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/root?.dat
 
@@ -1538,6 +1535,7 @@ rm -rf $RPM_BUILD_ROOT
 %{basisinstdir}/program/open-url
 %{basisinstdir}/program/offapi.rdb
 %{basisinstdir}/program/passwordcontainer.uno.so
+%{basisinstdir}/program/pagein-common
 %{basisinstdir}/program/plugin
 %{basisinstdir}/program/pluginapp.bin
 %{basisinstdir}/program/productregistration.uno.so
@@ -1887,6 +1885,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/resource/solveren-US.res
 %{basisinstdir}/program/vbaobj.uno.so
 %{basisinstdir}/share/registry/calc.xcd
+%{basisinstdir}/program/pagein-scalc
 %dir %{baseinstdir}
 %dir %{baseinstdir}/program
 %{baseinstdir}/program/scalc
@@ -1904,6 +1903,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %dir %{basisinstdir}
 %{basisinstdir}/help/en/sdraw.*
 %{basisinstdir}/share/registry/draw.xcd
+%{basisinstdir}/program/pagein-sdraw
 %dir %{baseinstdir}
 %dir %{baseinstdir}/program
 %{baseinstdir}/program/sdraw
@@ -1942,6 +1942,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/resource/bf_swen-US.res
 %{basisinstdir}/program/resource/t602filteren-US.res
 %{basisinstdir}/share/registry/writer.xcd
+%{basisinstdir}/program/pagein-swriter
 %dir %{baseinstdir}
 %dir %{baseinstdir}/program
 %{baseinstdir}/program/swriter
@@ -1967,6 +1968,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/share/config/soffice.cfg/simpress/effects.xml
 %{basisinstdir}/share/config/soffice.cfg/simpress/transitions.xml
 %{basisinstdir}/share/registry/impress.xcd
+%{basisinstdir}/program/pagein-simpress
 %dir %{baseinstdir}
 %dir %{baseinstdir}/program
 %{baseinstdir}/program/simpress


More information about the scm-commits mailing list