Author: megabajt Date: Fri Apr 10 11:22:59 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added -ure, -i18n-by, -i18n-gd, -i18n-gu, -i18n-mn, i18n-my and i18n-oc
subpackages
- build with system poppler, saxon, vigra and redland
- enabled extensions: minimizer, presenter-console and pdfimport
(move them to subpackages?)
- added --disable-access (didn't build without this flag)
- %{_libdir}/%{name}/basis-link is back (OOo won't start without it)
- packaged all remaining files
- I have built it --without-kde and seems to work on th-i686
---- Files affected:
SPECS:
openoffice.org.spec (1.820 -> 1.821)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.820 SPECS/openoffice.org.spec:1.821
--- SPECS/openoffice.org.spec:1.820 Fri Apr 10 12:39:02 2009
+++ SPECS/openoffice.org.spec Fri Apr 10 13:22:53 2009
@@ -9,9 +9,6 @@
#
# TODO:
# - ON PPC help FILES ARE NOT BUILT DUE TO SOME REASON (is missing java the
reason?)
-# -
-#
/usr/share/openoffice.org/share/registry/modules/org/openoffice/Office/Common/Common-ctl_dz.xcu
-#
/usr/share/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-dz.xcu
# - --with mono wants static mono
# - without system_db will not work (w/ java) as it will use db4.2 which
is too old (see r1.650)
# - problems with gcc-4.2.0: oowriter is useless (invisble text till
refresh)
@@ -169,6 +166,8 @@
Patch1005: %{name}-nsplugin-path.diff
Patch1006: %{name}-perl-nodiag.patch
Patch1007: %{name}-gcc42-swregion.diff
+
+Patch2000: %{name}-build.patch
URL: http://www.openoffice.org/
BuildConflicts: xmlsec1-devel
BuildRequires: /usr/bin/getopt
@@ -179,7 +178,7 @@
BuildRequires: atk-devel >= 1:1.9.0
BuildRequires: autoconf >= 2.51
BuildRequires: automake >= 1:1.9
-%{?with_system_beanshell:BuildRequires: beanshell}
+%{?with_system_beanshell:BuildRequires: java-beanshell}
BuildRequires: bison >= 1.875-4
BuildRequires: boost-devel >= 1.35.0
BuildRequires: cairo-devel >= 1.2.0
@@ -188,7 +187,7 @@
BuildRequires: curl-devel >= 7.9.8
%{?with_system_db:BuildRequires: db-cxx-devel}
%{?with_system_db:BuildRequires: db-devel}
-BuildRequires: dbus-glib-devel
+BuildRequires: dbus-glib-devel >= 0.70
# rpm has problems with determining this on builders
# BuildRequires: diskspace(%{_builddir}) >= 16Gb
BuildRequires: flex
@@ -217,6 +216,7 @@
BuildRequires: libwpg-devel >= 0.1.0
BuildRequires: libwps-devel
BuildRequires: libxml2-devel >= 2.0
+BuildRequires: libxslt-devel
%{?with_access:%{?with_system_mdbtools:BuildRequires: mdbtools-devel >= 0.6}}
%{?with_mono:BuildRequires: mono-csharp >= 1.2.3}
%{?with_mono:BuildRequires: mono-static >= 1.2.3}
@@ -231,6 +231,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-base
BuildRequires: pkgconfig
+BuildRequires: poppler-devel >= 0.8.0
BuildRequires: portaudio-devel
BuildRequires: python >= 2.2
BuildRequires: python-devel >= 2.2
@@ -262,6 +263,10 @@
%endif
BuildRequires: libxslt-progs
BuildRequires: xulrunner-devel
+
+BuildRequires: saxon
+BuildRequires: vigra-devel
+BuildRequires: redland-devel
Requires: %{name}-base = %{epoch}:%{version}-%{release}
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
Requires: %{name}-draw = %{epoch}:%{version}-%{release}
@@ -288,6 +293,8 @@
%define _noautostrip
.*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
%define _noautochrpath
.*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
+%define ooobasisdir %{_libdir}/%{name}/basis3.0
+
%description
OpenOffice.org is an open-source project sponsored by Sun Microsystems
and hosted by CollabNet. In October of 2000, Sun released the source
@@ -353,7 +360,7 @@
Group: X11/Applications
Requires(post,postun): desktop-file-utils
Requires(post,postun): shared-mime-info
-%{?with_system_beanshell:Requires: beanshell}
+%{?with_system_beanshell:Requires: java-beanshell}
# libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
Requires: cups-lib
%{?with_system_hsqldb:Requires: hsqldb >= 1.8.0}
@@ -558,6 +565,19 @@
%description testtools -l pl.UTF-8
Narzędzia QA dla OpenOffice.org, pozwalają na automatyczne testowanie.
+# FIXME
+%package ure
+Summary: UNO Runtime Environment
+Group: Libraries
+
+%description ure
+UNO is the component model of OpenOffice.org. UNO offers interoperability
+between programming languages, other components models and hardware
+architectures, either in process or over process boundaries, in the Intranet
+as well as in the Internet. UNO components may be implemented in and accessed
+from any programming language for which a UNO implementation (AKA language
+binding) and an appropriate bridge or adapter exists.
+
%package -n fonts-TTF-OpenSymbol
Summary: OpenSymbol fonts
Summary(pl.UTF-8): Fonty OpenSymbol
@@ -739,7 +759,22 @@
%description i18n-bs -l pl.UTF-8
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
-bośniackim
+bośniackim.
+
+# FIXME
+%package i18n-by
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-by
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-by -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
%package i18n-ca
Summary: OpenOffice.org - interface in Catalan language
@@ -1047,6 +1082,21 @@
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
irlandzkim.
+# FIXME
+%package i18n-gd
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-gd
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-gd -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
+
%package i18n-gl
Summary: OpenOffice.org - interface in Galician language
Summary(pl.UTF-8): OpenOffice.org - interfejs w języku galicyjskim
@@ -1079,6 +1129,21 @@
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
gudźarati.
+# FIXME
+%package i18n-gu
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-gu
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-gu -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
+
%package i18n-he
Summary: OpenOffice.org - interface in Hebrew language
Summary(pl.UTF-8): OpenOffice.org - interfejs w języku hebrajskim
@@ -1442,6 +1507,21 @@
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
marathi dla Indii.
+# FIXME
+%package i18n-mn
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-mn
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-mn -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
+
%package i18n-ms
Summary: OpenOffice.org - interface in Malay language
Summary(pl.UTF-8): OpenOffice.org - interfejs w języku malajskim
@@ -1460,6 +1540,21 @@
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
malajskim.
+# FIXME
+%package i18n-my
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-my
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-my -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
+
%package i18n-nb
Summary: OpenOffice.org - interface in Norwegian Bokmaal language
Summary(pl.UTF-8): OpenOffice.org - interfejs w języku norweskim (odmiana
Bokmaal)
@@ -1560,6 +1655,21 @@
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
ludu Soto.
+# FIXME
+%package i18n-oc
+Summary: OpenOffice.org - interface in ... language
+Summary(pl.UTF-8): OpenOffice.org - interfejs w języku ...
+Group: I18n
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description i18n-oc
+This package provides resources containing menus and dialogs in
+... language.
+
+%description i18n-oc -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+...
+
%package i18n-or_IN
Summary: OpenOffice.org - interface in Oriya language for India
Summary(pl.UTF-8): OpenOffice.org - interfejs w języku orija dla Indii
@@ -2136,6 +2246,8 @@
%{SOURCE51} %{SOURCE52} \
src
+%patch2000 -p1
+
# fixes
ln -s %{PATCH104} patches/hotfixes/%{basename:%{PATCH104}}.diff
@@ -2245,6 +2357,7 @@
--with-system-neon \
--with-system-odbc-headers \
--with-system-openssl \
+ --with-system-poppler \
--with-system-portaudio \
--with-system-python \
--with-system-sablot \
@@ -2323,7 +2436,14 @@
--with-tag=%{tag} \
--with-drink=coffee \
--enable-split-app-modules \
- --enable-split-opt-features
+ --enable-split-opt-features \
+ --disable-access \
+ --with-system-saxon \
+ --with-system-vigra \
+ --with-system-redland \
+ --enable-minimizer \
+ --enable-presenter-console \
+ --enable-pdfimport
"
# build-ooo script will pickup these
@@ -2414,9 +2534,6 @@
if [ ! -f installed.stamp ]; then
chmod -Rf a+rX,u+w,g-w,o-w $RPM_BUILD_ROOT
- # this symlink only confuses the rest of install
- rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis-link
-
# do we need those? large comparing to png
rm -r $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/*.svg
@@ -2425,24 +2542,24 @@
#rm $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
# some libs creep in somehow
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/libstl*.so*
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/libsndfile*
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/libgcc3_uno.so*
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/libstdc++*so*
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/libstl*.so*
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/libsndfile*
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/libgcc3_uno.so*
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/libstdc++*so*
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/sopatchlevel.sh
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/sopatchlevel.sh
# Remove setup log
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/setup.log
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/setup.log
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xdg
- #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/cde-open-url
+ #rm $RPM_BUILD_ROOT%{ooobasisdir}/program/cde-open-url
%if %{without java}
# Java-releated bits
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/hid.lst
- rm -r
$RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/java-set-classpath
- rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/jvmfwk3rc
+ rm -r $RPM_BUILD_ROOT%{ooobasisdir}/program/hid.lst
+ rm -r $RPM_BUILD_ROOT%{ooobasisdir}/program/java-set-classpath
+ rm -r $RPM_BUILD_ROOT%{ooobasisdir}/program/jvmfwk3rc
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
@@ -2463,25 +2580,28 @@
%if %{with mozilla}
install -d $RPM_BUILD_ROOT%{_browserpluginsdir}
- ln -s %{_libdir}/%{name}/basis*/program/libnpsoplugin.so
$RPM_BUILD_ROOT%{_browserpluginsdir}
+ ln -s %{_libdir}/%{name}/basis3.0/program/libnpsoplugin.so
$RPM_BUILD_ROOT%{_browserpluginsdir}
%endif
+ # FIXME: OOo doesn't start when sofficerc is a symlink:
+ # "Missing vcl resource. This indicates that files vital to
localization are missing. You might have a corrupt installation."
# 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
+ #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
+ # FIXME: do we really need it?
# This breaks apps: The application cannot be started. The component
manager is not available.
# Probably due to relative paths in unorc.
# mv
$RPM_BUILD_ROOT{%{_libdir}/%{name}/program,%{_sysconfdir}/%{name}}/unorc
# ln -s %{_sysconfdir}/%{name}/unorc
$RPM_BUILD_ROOT%{_libdir}/%{name}/program
# Use this instead:
- ln -s %{_libdir}/%{name}/basis*/program/unorc
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/unorc
+ #ln -s %{ooobasisdir}/program/unorc
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/unorc
perl -pi -e 's/^[ ]*LD_LIBRARY_PATH/# LD_LIBRARY_PATH/;s/export
LD_LIBRARY_PATH/# export LD_LIBRARY_PATH/' \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/setup
+ $RPM_BUILD_ROOT%{ooobasisdir}/program/setup
- chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/*.so
+ chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/basis3.0/program/*.so
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
# put share to %{_datadir} so we're able to produce noarch packages
@@ -2496,14 +2616,14 @@
ln -s ../../share/%{name}/readmes
$RPM_BUILD_ROOT%{_libdir}/%{name}/readmes
# fix python
- #sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g'
$RPM_BUILD_ROOT%{_libdir}/%{name}/basis*/program/*.py
+ #sed -i -e 's|#!/bin/python|#!%{_bindir}/python|g'
$RPM_BUILD_ROOT%{ooobasisdir}/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}/basis*/program/
+ cp -a build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin}
$RPM_BUILD_ROOT%{ooobasisdir}/program/
# Rename .desktop files to avoid conflicts with other applications
.desktops
# TODO: make patch instead.
@@ -2518,15 +2638,16 @@
# Find out locales
find_lang() {
- local lang="$1"
- echo "%%defattr(644,root,root,755)" > ${lang}.lang
+ local lang=$(echo $1 | sed -e 's/_/-/')
+ local langfn="$1"
+ echo "%%defattr(644,root,root,755)" > ${langfn}.lang
# help files
- if [ -f build/help_${lang}_list.txt ]; then
- cat build/help_${lang}_list.txt >> ${lang}.lang
+ if [ -f build/help_${langfn}_list.txt ]; then
+ cat build/help_${langfn}_list.txt >> ${langfn}.lang
fi
- lfile="build/lang_${lang}_list.txt"
+ lfile="build/lang_${langfn}_list.txt"
if [ -f ${lfile} ]; then
lprefix=$(bin/openoffice-xlate-lang -p ${lang} 2>/dev/null || :)
longlang=$(bin/openoffice-xlate-lang -l ${lang} 2>/dev/null ||
:)
@@ -2537,48 +2658,50 @@
# share/registry/res/${lang} (but en-US for en)
grep "^%%dir.*/res/${lang}[^/]*/\$" ${lfile} >> tmp.lang || :
# ... translate %dir into whole tree, handle special
wordbook/english case
- sed -e 's,^%%dir
,,;s,\(wordbook/english/\)$,\1soffice.dic,;s,/$,,' tmp.lang >> ${lang}.lang || :
+ sed -e 's,^%%dir
,,;s,\(wordbook/english/\)$,\1soffice.dic,;s,/$,,' tmp.lang >> ${langfn}.lang
|| :
# share/autocorr/acor${somecodes}.dat (if exist)
- grep '/autocorr/acor.*dat$' ${lfile} >> ${lang}.lang || :
+ grep '/autocorr/acor.*dat$' ${lfile} >> ${langfn}.lang || :
# user/config/* (if exist, without parent directory)
- grep '/user/config/..*' ${lfile} >> ${lang}.lang || :
- grep "/licenses/LICENSE_${lang}" ${lfile} >> ${lang}.lang || :
- grep "/readmes/README_${lang}" ${lfile} >> ${lang}.lang || :
+ grep '/user/config/..*' ${lfile} >> ${langfn}.lang || :
+ grep "/licenses/LICENSE_${lang}" ${lfile} >> ${langfn}.lang || :
+ grep "/readmes/README_${lang}" ${lfile} >> ${langfn}.lang || :
# lib/openoffice.org/presers/config/*.so[cdegh]
- grep "/presets/config/.*_${lang}\.so[cdegh]$" ${lfile} >>
${lang}.lang || :
+ grep "/presets/config/.*_${lang}\.so[cdegh]$" ${lfile} >>
${langfn}.lang || :
if [ "x${lprefix}" != "x" ] ; then
- grep "/presets/config/${lprefix}.*\.so[cdegh]$"
${lfile} >> ${lang}.lang || :
+ grep "/presets/config/${lprefix}.*\.so[cdegh]$"
${lfile} >> ${langfn}.lang || :
fi
# lib/openoffice.org/program/resource/*.res
- grep "/program/resource/.*${lang}.res$" ${lfile} >>
${lang}.lang || :
+ grep "/program/resource/.*${lang}.res$" ${lfile} >>
${langfn}.lang || :
# lib/openoffice.org/share/autocorr/*.dat
- grep "/share/autocorr/.*${lang}.dat$" ${lfile} >> ${lang}.lang
|| :
- grep -i "/share/autocorr/.*${lang}-${lang}.dat$" ${lfile} >>
${lang}.lang || :
+ grep "/share/autocorr/.*${lang}.dat$" ${lfile} >>
${langfn}.lang || :
+ grep -i "/share/autocorr/.*${lang}-${lang}.dat$" ${lfile} >>
${langfn}.lang || :
# lib/openoffice.org/share/autotext/$lang
- grep "/share/autotext/${lang}$" ${lfile} >> ${lang}.lang || :
- grep "/share/autotext/${lang}/" ${lfile} >> ${lang}.lang || :
+ grep "/share/autotext/${lang}$" ${lfile} >> ${langfn}.lang || :
+ grep "/share/autotext/${lang}/" ${lfile} >> ${langfn}.lang || :
+ #
lib/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-$lang.xcu
+ grep
"/share/registry/modules/org/openoffice/Setup/Langpack-${lang}.xcu$" ${lfile}
>> ${langfn}.lang || :
# lib/openoffice.org/share/registry/res/$lang
- grep "/share/registry/res/${lang}$" ${lfile} >> ${lang}.lang ||
:
- grep "/share/registry/res/${lang}/" ${lfile} >> ${lang}.lang ||
:
+ grep "/share/registry/res/${lang}$" ${lfile} >> ${langfn}.lang
|| :
+ grep "/share/registry/res/${lang}/" ${lfile} >> ${langfn}.lang
|| :
# lib/openoffice.org/share/template/$lang
- grep "/share/template/${lang}$" ${lfile} >> ${lang}.lang || :
- grep "/share/template/${lang}/" ${lfile} >> ${lang}.lang || :
+ grep "/share/template/${lang}$" ${lfile} >> ${langfn}.lang || :
+ grep "/share/template/${lang}/" ${lfile} >> ${langfn}.lang || :
# lib/openoffice.org/share/template/wizard/letter/lang
- grep "/share/template/wizard/letter/${lang}$" ${lfile} >>
${lang}.lang || :
- grep "/share/template/wizard/letter/${lang}$"
build/common_list.txt >> ${lang}.lang || :
- grep "/share/template/wizard/letter/${lang}/" ${lfile} >>
${lang}.lang || :
- grep "/share/template/wizard/letter/${lang}/"
build/common_list.txt >> ${lang}.lang || :
+ grep "/share/template/wizard/letter/${lang}$" ${lfile} >>
${langfn}.lang || :
+ grep "/share/template/wizard/letter/${lang}$"
build/common_list.txt >> ${langfn}.lang || :
+ grep "/share/template/wizard/letter/${lang}/" ${lfile} >>
${langfn}.lang || :
+ grep "/share/template/wizard/letter/${lang}/"
build/common_list.txt >> ${langfn}.lang || :
# lib/openoffice.org/share/wordbook/$lang
- grep "/share/wordbook/${lang}$" ${lfile} >> ${lang}.lang || :
- grep "/share/wordbook/${lang}/" ${lfile} >> ${lang}.lang || :
+ grep "/share/wordbook/${lang}$" ${lfile} >> ${langfn}.lang || :
+ grep "/share/wordbook/${lang}/" ${lfile} >> ${langfn}.lang || :
# lib/openoffice.org/share/samples/$lang
- grep "/share/samples/${lang}$" ${lfile} >> ${lang}.lang || :
- grep "/share/samples/${lang}/" ${lfile} >> ${lang}.lang || :
- grep "/help/${lang}$" ${lfile} >> ${lang}.lang || :
- grep "/help/${lang}/" ${lfile} >> ${lang}.lang || :
- grep
"/share/config/soffice.cfg/modules/swform/accelerator/${lang}/"
build/common_list.txt >> ${lang}.lang || :
- grep
"/share/config/soffice.cfg/modules/swreport/accelerator/${lang}/"
build/common_list.txt >> ${lang}.lang || :
- grep
"/share/config/soffice.cfg/modules/swxform/accelerator/${lang}/"
build/common_list.txt >> ${lang}.lang || :
+ grep "/share/samples/${lang}$" ${lfile} >> ${langfn}.lang || :
+ grep "/share/samples/${lang}/" ${lfile} >> ${langfn}.lang || :
+ grep "/help/${lang}$" ${lfile} >> ${langfn}.lang || :
+ grep "/help/${lang}/" ${lfile} >> ${langfn}.lang || :
+ grep
"/share/config/soffice.cfg/modules/swform/accelerator/${lang}/"
build/common_list.txt >> ${langfn}.lang || :
+ grep
"/share/config/soffice.cfg/modules/swreport/accelerator/${lang}/"
build/common_list.txt >> ${langfn}.lang || :
+ grep
"/share/config/soffice.cfg/modules/swxform/accelerator/${lang}/"
build/common_list.txt >> ${langfn}.lang || :
fi
}
@@ -2590,13 +2713,14 @@
done
%{__sed} -i -e '
- s,%{_libdir}/%{name}/help,%{_libdir}/%{name}/basis*/help,;
+ s,%{_libdir}/%{name}/help,%{ooobasisdir}/help,;
s,%{_libdir}/%{name}/licenses,%{_datadir}/%{name}/licenses,;
s,%{_libdir}/%{name}/readmes,%{_datadir}/%{name}/readmes,;
s,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,;
' *.lang
%clean
+exit 1
rm -rf $RPM_BUILD_ROOT
%pretrans core
@@ -2612,8 +2736,8 @@
mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d || mv
%{_libdir}/%{name}/$d{,.rpmsave}
fi
done
-if [ -L %{_libdir}/%{name}/basis*/presets ]; then
- rm -f %{_libdir}/%{name}/basis*/presets
+if [ -L %{ooobasisdir}/presets ]; then
+ rm -f %{ooobasisdir}/presets
fi
%post core
@@ -2692,446 +2816,354 @@
%doc %{_libdir}/%{name}/*README*
# TODO: check where these really belong
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/OGLTrans.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/libvbaobj*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/bootstrap.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/stringresource*.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/updatefeed.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/fastsax.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libaffine_uno_uno.so
-%{!?with_system_db:%attr(755,root,root)
%{_libdir}/%{name}/basis*/program/libdb-4.2.so}
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/liblpsolve*.so
-#%attr(755,root,root) %{_libdir}/%{name}/basis*/program/libmtfrenderer.uno.so
-%if %{with java}
-%endif
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/libtextcat.so
-%attr(755,root,root) %{_libdir}/%{name}/ure/lib/libunsafe_uno_uno.so
+%attr(755,root,root) %{ooobasisdir}/program/OGLTrans.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/stringresource*.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/updatefeed.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/fastsax.uno.so
+
+%{!?with_system_db:%attr(755,root,root) %{ooobasisdir}/program/libdb-4.2.so}
+%attr(755,root,root) %{ooobasisdir}/program/liblpsolve*.so
+#%attr(755,root,root) %{ooobasisdir}/program/libmtfrenderer.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/libtextcat.so
+
# maybe external is possible?
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/libxmlsec1*.so
+%attr(755,root,root) %{ooobasisdir}/program/libxmlsec1*.so
%attr(755,root,root) %{_libdir}/%{name}/program/oosplash.bin
-%attr(755,root,root) %{_libdir}/%{name}/basis*/program/simplecanvas.uno.so
-#%attr(755,root,root) %{_libdir}/%{name}/ure/lib/scsolver.uno.so
-%{_libdir}/%{name}/basis*/share/config/images_tango.zip
-%{_libdir}/%{name}/basis*/share/registry/data/org/openoffice/UserProfile.xcu
-%{_libdir}/%{name}/basis*/program/root3.dat
-%{_libdir}/%{name}/basis*/program/root4.dat
-%{_libdir}/%{name}/basis*/program/root5.dat
-%{_libdir}/%{name}/basis*/program/resource/accen-US.res
-%{_libdir}/%{name}/basis*/program/resource/chartcontrolleren-US.res
+%attr(755,root,root) %{ooobasisdir}/program/simplecanvas.uno.so
+%{ooobasisdir}/share/config/images_tango.zip
+%{ooobasisdir}/share/registry/data/org/openoffice/UserProfile.xcu
+%{ooobasisdir}/program/root3.dat
+%{ooobasisdir}/program/root4.dat
+%{ooobasisdir}/program/root5.dat
+%{ooobasisdir}/program/resource/accen-US.res
+%{ooobasisdir}/program/resource/chartcontrolleren-US.res
%if %{with java}
-%{_libdir}/%{name}/basis*/program/resource/rpten-US.res
-%{_libdir}/%{name}/basis*/program/resource/rptuien-US.res
+%{ooobasisdir}/program/resource/rpten-US.res
+%{ooobasisdir}/program/resource/rptuien-US.res
%endif
-%{_libdir}/%{name}/basis*/program/resource/sben-US.res
+%{ooobasisdir}/program/resource/sben-US.res
-#%{_libdir}/%{name}/basis*/program/resource/scsolveren-US.res
-%{_libdir}/%{name}/basis*/program/resource/sdbclen-US.res
-%{_libdir}/%{name}/basis*/program/resource/t602filteren-US.res
-%{_libdir}/%{name}/basis*/share/config/javasettingsunopkginstall.xml
-
-%dir %{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform
-%dir
%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform/accelerator
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform/accelerator/en-US
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform/toolbar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform/menubar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swform/statusbar
-%dir %{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport
-%dir
%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport/accelerator
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport/menubar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport/statusbar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport/toolbar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swreport/accelerator/en-US
-%dir %{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform
-%dir
%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform/accelerator
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform/menubar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform/statusbar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform/toolbar
-%{_libdir}/%{name}/basis*/share/config/soffice.cfg/modules/swxform/accelerator/en-US
+#%{ooobasisdir}/program/resource/scsolveren-US.res
+%{ooobasisdir}/program/resource/sdbclen-US.res
+%{ooobasisdir}/program/resource/t602filteren-US.res
+%{ooobasisdir}/share/config/javasettingsunopkginstall.xml
+
+%dir %{ooobasisdir}/share/config/soffice.cfg/modules/swform
+%dir %{ooobasisdir}/share/config/soffice.cfg/modules/swform/accelerator
+%{ooobasisdir}/share/config/soffice.cfg/modules/swform/accelerator/en-US
+%{ooobasisdir}/share/config/soffice.cfg/modules/swform/toolbar
+%{ooobasisdir}/share/config/soffice.cfg/modules/swform/menubar
+%{ooobasisdir}/share/config/soffice.cfg/modules/swform/statusbar
+%dir %{ooobasisdir}/share/config/soffice.cfg/modules/swreport
+%dir %{ooobasisdir}/share/config/soffice.cfg/modules/swreport/accelerator
+%{ooobasisdir}/share/config/soffice.cfg/modules/swreport/menubar
+%{ooobasisdir}/share/config/soffice.cfg/modules/swreport/statusbar
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.820&r2=1.821&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
