Author: glen Date: Thu Mar 8 22:13:40 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- AC-branch merge
---- Files affected:
SPECS:
openoffice.org.spec (1.722 -> 1.723)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.722 SPECS/openoffice.org.spec:1.723
--- SPECS/openoffice.org.spec:1.722 Thu Mar 8 17:21:40 2007
+++ SPECS/openoffice.org.spec Thu Mar 8 23:13:35 2007
@@ -2240,81 +2240,99 @@
fi
%install
-rm -rf $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
-
-export DESTDIR=$RPM_BUILD_ROOT
-export TMP="%{tmpdir}"
-export TEMP="%{tmpdir}"
-export DEFAULT_TO_ENGLISH_FOR_PACKING=1
-
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+if [ ! -f installed.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf $RPM_BUILD_ROOT
-# Add in the regcomp tool since some people need it for 3rd party add-ons
-cp -f build/%{ssnap}/solver/%{subver}/unxlng*.pro/bin/regcomp{,.bin}
$RPM_BUILD_ROOT%{_libdir}/%{name}/program/
+ # limit to single process installation, it's safe at least
+ %{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
-# fix python
-sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g'
$RPM_BUILD_ROOT%{_libdir}/%{name}/program/*.py
-
-# Really needed?
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/kde
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/cde
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/gnome
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/icons
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome
-
-# 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
-
-# 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/%{ssnap}/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
-
-# 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/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*
+ export DESTDIR=$RPM_BUILD_ROOT
+ export TMP="%{tmpdir}"
+ export TEMP="%{tmpdir}"
+ export DEFAULT_TO_ENGLISH_FOR_PACKING=1
+
+ %{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+
+ # Add in the regcomp tool since some people need it for 3rd party
add-ons
+ cp -f build/%{ssnap}/solver/%{subver}/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
+
+ # Really needed?
+ install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/kde
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/cde
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/gnome
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/icons
+ rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome
+
+ # 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
+
+ # 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/%{ssnap}/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
+
+ # 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/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
+
+ %if %{without java}
+ # Java-releated bits
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
+ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
+ %endif
+fi
# Find out locales
find_lang() {
@@ -2328,8 +2346,8 @@
lfile="build/lang_${lang}_list.txt"
if [ -f ${lfile} ]; then
- lprefix="`bin/openoffice-xlate-lang -p ${lang} 2>/dev/null ||
echo ""`"
- longlang="`bin/openoffice-xlate-lang -l ${lang} 2>/dev/null ||
echo ""`"
+ lprefix=$(bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || :)
+ longlang=$(bin/openoffice-xlate-lang -l ${lang} 2>/dev/null ||
:)
# share/*/${longlang}
if [ "x${longlang}" != "x" ] ; then
grep "^%%dir.*/${longlang}/\$" ${lfile} > tmp.lang || :
@@ -2371,6 +2389,9 @@
# lib/openoffice.org/share/wordbook/$lang
grep "/share/wordbook/${lang}$" ${lfile} >> ${lang}.lang || :
grep "/share/wordbook/${lang}/" ${lfile} >> ${lang}.lang || :
+ # lib/openoffice.org/share/samples/$lang
+ grep "/share/samples/${lang}$" ${lfile} >> ${lang}.lang || :
+ grep "/share/samples/${lang}/" ${lfile} >> ${lang}.lang || :
%if %{with java}
grep "/help/${lang}$" ${lfile} >> ${lang}.lang || :
grep "/help/${lang}/" ${lfile} >> ${lang}.lang || :
@@ -2379,28 +2400,12 @@
}
rm -f *.lang*
-langlist="`ls build/lang_*_list.txt|sed -e
's=build/lang_\(.*\)_list.txt=\1=g'`"
+langlist=$(ls build/lang_*_list.txt | sed -e
's=build/lang_\(.*\)_list.txt=\1=g')
for lang in $langlist; do
find_lang $lang
done
-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
-
-%if %{without java}
-# Java-releated bits
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/hid.lst
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/java-set-classpath
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/program/jvmfwk3rc
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2523,6 +2528,7 @@
%{_libdir}/%{name}/share/gallery
%{_libdir}/%{name}/share/psprint
%dir %{_libdir}/%{name}/share/samples
+%dir %{_libdir}/%{name}/share/samples/en-US
%dir %{_libdir}/%{name}/share/template
%dir %{_libdir}/%{name}/share/template/wizard
%dir %{_libdir}/%{name}/share/template/wizard/letter
@@ -3796,6 +3802,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.723 2007/03/08 22:13:35 glen
+- AC-branch merge
+
Revision 1.722 2007/03/08 16:21:40 glen
- openclipart gallery built externally, no more at install stage; rel 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.722&r2=1.723&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
