SPECS: openoffice.org.spec - AC-branch merge
glen
glen at pld-linux.org
Tue Mar 20 01:57:51 CET 2007
Author: glen Date: Tue Mar 20 00:57:51 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- AC-branch merge
---- Files affected:
SPECS:
openoffice.org.spec (1.743 -> 1.744)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.743 SPECS/openoffice.org.spec:1.744
--- SPECS/openoffice.org.spec:1.743 Sun Mar 18 16:24:17 2007
+++ SPECS/openoffice.org.spec Tue Mar 20 01:57:46 2007
@@ -133,6 +133,7 @@
Patch107: %{name}-stl-amd64.patch
Patch108: %{name}-java6.patch
Patch109: %{name}-agg25.patch
+Patch110: %{name}-nsplugin-path.diff
URL: http://www.openoffice.org/
BuildRequires: /usr/bin/getopt
BuildRequires: STLport-devel >= 2:5.0.0
@@ -233,9 +234,12 @@
%define specflags -fno-strict-aliasing
-# No ELF objects there to strip/chrpath (skips processing 17k files totaling 415M)
-%define _noautostrip .*%{_datadir}/%{name}/.*
-%define _noautochrpath .*%{_datadir}/%{name}/.*
+# No ELF objects there to strip/chrpath, skips processing:
+# - share/ - 17000 files of 415M
+# - help/ - 6500 files of 1.4G
+# - program/resource/ - 5610 files of 216M
+%define _noautostrip .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
+%define _noautochrpath .*\\(%{_datadir}\\|%{_libdir}/%{name}/program/resource\\)/.*
%description
OpenOffice.org is an open-source project sponsored by Sun Microsystems
@@ -2082,6 +2086,7 @@
install $P patches/src680/$PATCHNAME
echo $PATCHNAME >> patches/src680/apply
done
+cp %{PATCH110} patches/src680/nsplugin-path.diff
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2276,8 +2281,8 @@
fi
%install
-if [ ! -f installed.stamp -o ! -d $RPM_BUILD_ROOT ]; then
- rm -rf $RPM_BUILD_ROOT
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf $RPM_BUILD_ROOT makeinstall.stamp
# limit to single process installation, it's safe at least
%{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
@@ -2290,78 +2295,32 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+ # save orignal install layout
find $RPM_BUILD_ROOT -ls > ls.txt
+ touch makeinstall.stamp
+fi
- # Add in the regcomp tool since some people need it for 3rd party add-ons
- cp -a build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
-
- # fix python
- sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g' $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py
-
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/kde
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/cde
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/gnome
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/icons
- rm -r $RPM_BUILD_ROOT%{_datadir}/applnk
- rm -r $RPM_BUILD_ROOT%{_datadir}/gnome
+if [ ! -f installed.stamp ]; then
# do we need those? large comparing to png
- rm -r $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/*.svg
-
- # Remove dictionaries (in separate pkg)
- rm -vf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
- %if %{with system_myspell}
- rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
- ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
- %else
- touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
- %endif
-
- %if %{with mozilla}
- install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
- ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
- %endif
-
- # configs
- install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
- mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
- ln -s %{_sysconfdir}/%{name}/sofficerc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/*.svg
# is below comment true?
# OOo should not install the Vera fonts, they are Required: now
- rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
-
- # Copy fixed OpenSymbol to correct location
- install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
- install build/%{tag}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
-
- # We don't need spadmin (gtk) or the setup application
- rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/setup
- rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/crash_report.bin
- rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-setup.desktop
- rm -f $RPM_BUILD_ROOT%{_desktopdir}/openoffice-printeradmin.desktop
-
- #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/gnomeint
+ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
# some libs creep in somehow
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstl*.so*
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libsndfile*
+ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libgcc_s.so*
+ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstdc++*so*
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/sopatchlevel.sh
- perl -pi -e 's/^[ ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
# Remove setup log
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup.log
- # Remove copied system libraries
- rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libgcc_s.so* \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/program/libstdc++*so*
-
- chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
-
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
- rm -rf $RPM_BUILD_ROOT/opt/gnome
- rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
+ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/program/cde-open-url
%if %{without java}
# Java-releated bits
@@ -2373,10 +2332,53 @@
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
%endif
- # put share to %{_datadir} so we're able to produce noarch packages
+ # Remove dictionaries (in separate pkg)
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/*
+ %if %{with system_myspell}
+ rmdir $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
+ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo
+ %else
+ touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
+ %endif
+
+ %if %{with mozilla}
+ install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
+ ln -s %{_libdir}/%{name}/program/libnpsoplugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+ %endif
+
+ # configs
+ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+ mv $RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/sofficerc
+ ln -s %{_sysconfdir}/%{name}/sofficerc $RPM_BUILD_ROOT%{_libdir}/%{name}/program
+
+ perl -pi -e 's/^[ ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/program/setup
+
+ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.so
+
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+ # put share to %{_datadir} so we're able to produce noarch packages
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
+ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}
+ ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
+ 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
+
+ # Copy fixed OpenSymbol to correct location
+ install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
+ install build/%{tag}/extras/source/truetype/symbol/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
+
+ # Add in the regcomp tool since some people need it for 3rd party add-ons
+ cp -a build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
touch installed.stamp
fi
@@ -2453,7 +2455,13 @@
find_lang $lang
done
-%{__sed} -i -e 's,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,' *.lang
+%{__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
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2465,10 +2473,12 @@
rmdir %{_libdir}/%{name}/share/dict/ooo 2>/dev/null || mv -v %{_libdir}/%{name}/share/dict/ooo{,.rpmsave} || :
fi
%endif
-if [ -d %{_libdir}/%{name}/share ] && [ ! -L %{_libdir}/%{name}/share ]; then
- install -d %{_datadir}/%{name}
- mv %{_libdir}/%{name}/share %{_datadir}/%{name}/share || mv %{_libdir}/%{name}/share{,.rpmsave}
-fi
+for d in presets share 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
%post core
%update_mime_database
@@ -2549,10 +2559,6 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/sofficerc
%dir %{_libdir}/%{name}
-%if %{with java}
-%dir %{_libdir}/%{name}/help/en
-%dir %{_libdir}/%{name}/program/classes
-%endif
%dir %{_libdir}/%{name}/program
%dir %{_libdir}/%{name}/program/resource
@@ -2563,10 +2569,10 @@
%{_libdir}/%{name}/program/unorc
%{_libdir}/%{name}/program/bootstraprc
%{_libdir}/%{name}/program/configmgrrc
-%dir %{_libdir}/%{name}/licenses
-%dir %{_libdir}/%{name}/readmes
-# symlink
+# symlinks
+%{_libdir}/%{name}/licenses
+%{_libdir}/%{name}/readmes
%{_libdir}/%{name}/share
%dir %{_datadir}/%{name}
@@ -2887,22 +2893,23 @@
%{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-math.xcu
%{_datadir}/%{name}/share/registry/modules/org/openoffice/TypeDetection/UISort/UISort-writer.xcu
-%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
+%{_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
# Programs
%attr(755,root,root) %{_bindir}/ooconfig
@@ -2941,19 +2948,22 @@
%{_libdir}/%{name}/program/versionrc
%if %{with java}
+%{_libdir}/%{name}/help
+%dir %{_datadir}/%{name}/help
+%dir %{_datadir}/%{name}/help/en
+%{_datadir}/%{name}/help/en/*.html
+%{_datadir}/%{name}/help/en/*.css
+%{_datadir}/%{name}/help/en/sbasic.*
+%{_datadir}/%{name}/help/en/schart.*
+%{_datadir}/%{name}/help/en/shared.*
+%{_datadir}/%{name}/help/*.xsl
+
%attr(755,root,root) %{_libdir}/%{name}/program/javaldx
%attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
%{_libdir}/%{name}/program/jvmfwk3rc
%{_libdir}/%{name}/program/JREProperties.class
-%dir %{_libdir}/%{name}/help
-%{_libdir}/%{name}/help/en/*.html
-%{_libdir}/%{name}/help/en/*.css
-%{_libdir}/%{name}/help/en/sbasic.*
-%{_libdir}/%{name}/help/en/schart.*
-%{_libdir}/%{name}/help/en/shared.*
-%{_libdir}/%{name}/help/*.xsl
-
+%dir %{_libdir}/%{name}/program/classes
%{_libdir}/%{name}/program/classes/ScriptFramework.jar
%{_libdir}/%{name}/program/classes/ScriptProviderForBeanShell.jar
%{_libdir}/%{name}/program/classes/ScriptProviderForJava.jar
@@ -3019,7 +3029,7 @@
%{_mandir}/man1/openoffice.1*
# en-US
-%{_libdir}/%{name}/presets/config/*_en-US.so*
+%{_datadir}/%{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
@@ -3091,10 +3101,13 @@
%{_libdir}/%{name}/program/resource/xmlsec680en-US.res
%{_libdir}/%{name}/program/resource/xsltdlg680en-US.res
-%{_libdir}/%{name}/licenses/LICENSE_en-US
-%{_libdir}/%{name}/licenses/LICENSE_en-US.html
-%{_libdir}/%{name}/readmes/README_en-US
-%{_libdir}/%{name}/readmes/README_en-US.html
+%dir %{_datadir}/%{name}/licenses
+%{_datadir}/%{name}/licenses/LICENSE_en-US
+%{_datadir}/%{name}/licenses/LICENSE_en-US.html
+
+%dir %{_datadir}/%{name}/readmes
+%{_datadir}/%{name}/readmes/README_en-US
+%{_datadir}/%{name}/readmes/README_en-US.html
%attr(755,root,root) %{_libdir}/%{name}/program/acceptor.uno.so
%attr(755,root,root) %{_libdir}/%{name}/program/basprov680*.uno.so
@@ -3392,7 +3405,7 @@
%{_pixmapsdir}/ooo-base.png
%{_libdir}/%{name}/program/resource/cnr680en-US.res
%if %{with java}
-%{_libdir}/%{name}/help/en/sdatabase.*
+%{_datadir}/%{name}/help/en/sdatabase.*
%endif
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
@@ -3421,7 +3434,7 @@
%{_iconsdir}/hicolor/*/apps/ooo-calc.png
%{_pixmapsdir}/ooo-calc.png
%if %{with java}
-%{_libdir}/%{name}/help/en/scalc.*
+%{_datadir}/%{name}/help/en/scalc.*
%endif
%{_libdir}/%{name}/program/resource/analysis680en-US.res
%{_libdir}/%{name}/program/resource/bf_sc680en-US.res
@@ -3447,7 +3460,7 @@
%{_iconsdir}/hicolor/*/apps/ooo-draw.png
%{_pixmapsdir}/ooo-draw.png
%if %{with java}
-%{_libdir}/%{name}/help/en/sdraw.*
+%{_datadir}/%{name}/help/en/sdraw.*
%endif
%{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw
%{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -3475,7 +3488,7 @@
%{_iconsdir}/hicolor/*/apps/ooo-writer.png
%{_pixmapsdir}/ooo-writer.png
%if %{with java}
-%{_libdir}/%{name}/help/en/swriter.*
+%{_datadir}/%{name}/help/en/swriter.*
%{_libdir}/%{name}/program/classes/writer2latex.jar
%endif
%{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter
@@ -3508,7 +3521,7 @@
%{_iconsdir}/hicolor/*/apps/ooo-impress.png
%{_pixmapsdir}/ooo-impress.png
%if %{with java}
-%{_libdir}/%{name}/help/en/simpress.*
+%{_datadir}/%{name}/help/en/simpress.*
%endif
%{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress
%{_datadir}/%{name}/share/config/soffice.cfg/simpress/
@@ -3532,7 +3545,7 @@
%{_iconsdir}/hicolor/*/apps/ooo-math.png
%{_pixmapsdir}/ooo-math.png
%if %{with java}
-%{_libdir}/%{name}/help/en/smath.*
+%{_datadir}/%{name}/help/en/smath.*
%endif
%{_libdir}/%{name}/program/resource/bf_sm680en-US.res
%{_libdir}/%{name}/program/resource/sm680en-US.res
@@ -3617,9 +3630,9 @@
%if %{with mozilla}
%files -n browser-plugin-%{name}
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
%attr(755,root,root) %{_browserpluginsdir}/libnpsoplugin.so
-%{_libdir}/%{name}/program/libnpsoplugin.so
+%attr(755,root,root) %{_libdir}/%{name}/program/nsplugin
+%attr(755,root,root) %{_libdir}/%{name}/program/libnpsoplugin.so
%endif
%if %{with i18n}
@@ -3907,6 +3920,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.744 2007/03/20 00:57:46 glen
+- AC-branch merge
+
Revision 1.743 2007/03/18 15:24:17 glen
- update from AC-branch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.743&r2=1.744&f=u
More information about the pld-cvs-commit
mailing list