Accepting request 171281 from LibreOffice:Unstable
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) OBS-URL: https://build.opensuse.org/request/show/171281 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=30
This commit is contained in:
Petr Mladek
Git OBS Bridge
parent
08d67b91da
commit
701d96e34a
3
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Normal file
3
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
|
||||
size 96939
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
|
||||
size 14884071
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4ace7c0280e5ee8d4941b33449ee10edf1515437483d55ae387cc4de2c2bea0
|
||||
size 432064
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8a8a9ad79352f4d07ec162a356955dde3d3efb808bbc0d8a432ff150c2d09e1
|
||||
size 2603105
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4
|
||||
size 4461644
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:643c5307a3fdc31754a18c8c1398d4036a107e4bdc03d9a265fcadfc85d4a07a
|
||||
size 4352127
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7394e8a88cbe70195b8111b8bcd42080825a8a4d7a61d613af6416dcbbfef760
|
||||
size 682455
|
||||
3
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
Normal file
3
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:92383930f110d691a38b64684d96cb4f30d7f0550dbcfe8b227ca5c7a33fb838
|
||||
size 4910188
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5a0cd4a6e33a24ee11d3bfde50e9bbcfc237afa5d20713ffd994f90bdde193c3
|
||||
size 4603398
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cbb71d5d1af345c3bd9ceebbc78ddfbe70e3747c3cf95532a4fdef2abb034bae
|
||||
size 613182
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae12a40ebc03843bca8fdf4fe0d6376375d499d51ba34fa7d25d9c7344dfe69e
|
||||
size 1088522
|
||||
3
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
Normal file
3
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e6f079e9bd92d9eddc3fcdeb943408c4bfd3d25a569a7060c9221f174403cdf1
|
||||
size 19001722
|
||||
3
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
Normal file
3
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8
|
||||
size 4293291
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:21c461c558c61a51f24d35a48e2bf3b3bebf27ffc361f99bec45496903938c42
|
||||
size 614264
|
||||
3
8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
Normal file
3
8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:30829484b2328d0666c859b32370d3826b3468f3945d054abdac8234f4083c77
|
||||
size 1373518
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4980e2815275985d0922eb8cc5f8d6c5797bd2239f559191dcad6874ea7089c3
|
||||
size 388940
|
||||
9
README-draw-extensions.txt
Normal file
9
README-draw-extensions.txt
Normal file
@ -0,0 +1,9 @@
|
||||
Dear customer,
|
||||
|
||||
the PDF import extension has been integrated into the main application.
|
||||
The result is that this package is empty. We keep it for future use
|
||||
because it makes the maintenance process easier.
|
||||
|
||||
|
||||
Sincerely,
|
||||
Your SUSE team
|
||||
@ -5,4 +5,4 @@ provide it in a later bugfix release. Thanks for understanding.
|
||||
|
||||
|
||||
Sincerely,
|
||||
Your openSUSE team
|
||||
Your SUSE team
|
||||
|
||||
@ -7,5 +7,5 @@ Thanks for understanding.
|
||||
|
||||
Have a good experience with the upstream solver,
|
||||
|
||||
Your openSUSE team
|
||||
Your SUSE team
|
||||
|
||||
|
||||
3
a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
Normal file
3
a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eeffe2d931217efc4c0a5ea0a1e46d843a4c65b2346f22e543d619da7282562e
|
||||
size 636667
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
|
||||
size 2732347
|
||||
3
b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
Normal file
3
b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c1271cba2494d8c52bba08fa3b14cdca7401b5f90faacb8b206364c84233ffb
|
||||
size 515564
|
||||
3
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
Normal file
3
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
|
||||
size 70349
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:27ac68831ff430882b29a23e4af041fff646c1bfd143b76cd1b1ecbc09e0f29d
|
||||
size 72340
|
||||
11
bridges-missing-cxxflags.diff
Normal file
11
bridges-missing-cxxflags.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- bridges/Library_gcc3_linux_intel.mk.old 2012-12-18 16:11:42.000000000 +0100
|
||||
+++ bridges/Library_gcc3_linux_intel.mk 2013-01-04 18:14:38.000000000 +0100
|
||||
@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_exception_o
|
||||
|
||||
$(eval $(call gb_Library_add_cxxobjects,gcc3_uno,\
|
||||
bridges/source/cpp_uno/shared/cppinterfaceproxy \
|
||||
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
||||
+ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@ -1,13 +0,0 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in.orig
|
||||
+++ configure.in
|
||||
@@ -150,7 +150,7 @@ dnl ====================================
|
||||
#defaults unless the os test overrides this:
|
||||
test_randr=yes
|
||||
test_xrender=yes
|
||||
-test_cups=yes
|
||||
+test_cups=no
|
||||
test_fontconfig=yes
|
||||
test_cairo=yes
|
||||
|
||||
17
build-max-64-jobs.diff
Normal file
17
build-max-64-jobs.diff
Normal file
@ -0,0 +1,17 @@
|
||||
Index: configure.ac
|
||||
===================================================================
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -11999,6 +11999,12 @@ if test "$no_parallelism_make" = "YES" &
|
||||
fi
|
||||
fi
|
||||
|
||||
+if test $PARALLELISM -gt 64 ; then
|
||||
+ AC_MSG_WARN([dmake does not work with more than 64 jobs, reducing parallelism to 64.])
|
||||
+ add_warning "dmake does not work with more than 64 jobs, reducing parallelism to 64."
|
||||
+ PARALLELISM="64"
|
||||
+fi
|
||||
+
|
||||
AC_MSG_RESULT([$PARALLELISM])
|
||||
AC_SUBST(PARALLELISM)
|
||||
|
||||
79
build_prepare.inc
Normal file
79
build_prepare.inc
Normal file
@ -0,0 +1,79 @@
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
%if 0%{?suse_version} < 01230
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
%endif
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs="1"
|
||||
%endif
|
||||
%endif
|
||||
# do not eat all memory
|
||||
echo "Available memory:"
|
||||
free
|
||||
echo "System limits:"
|
||||
ulimit -a
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=1000
|
||||
else
|
||||
mem_per_process=600
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=1200
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-parallelism=$lo_jobs"
|
||||
fi
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --enable-icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
# FIXME: -fno-omit-frame-pointer is needed in LO-4.0; the order of compliation flags is already fixed in master for LO-4.1
|
||||
# The current situation causes build (bridge test) failure on i586 systems
|
||||
ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing -fno-omit-frame-pointer"
|
||||
CFLAGS="$ARCH_FLAGS"
|
||||
CXXFLAGS="$ARCH_FLAGS"
|
||||
export ARCH_FLAGS CFLAGS CXXFLAGS
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
%if 0%{?suse_version} < 01230
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
%endif
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-%version/zip30:$PATH"
|
||||
%endif
|
||||
# Whack in our python2 so we don't have to use internal one
|
||||
# which is quite nightmare.
|
||||
export PYTHON=/usr/bin/python
|
||||
export PYTHON_CFLAGS=`pkg-config --cflags python`
|
||||
export PYTHON_LIBS=`pkg-config --libs python`
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7895f0cf07ac98bd88f6d5cf26ba7f1d72fd8acaeb43b27ffa24846fccc80343
|
||||
size 629054
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
|
||||
size 16113737
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4a1b995fc558bea6e1d85cb6a371bd8ecd60ed5ff4b8bfa66e4465ee396fd8ac
|
||||
size 2262874
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:92565e1283cd9834bfef155ba29ff6f4e62699ef0debdf86687e21e9fbc9b68e
|
||||
size 636510
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c1f668f29f00024bf91387c2de65a80c47d9db4561083c054d7fb95b45b51abb
|
||||
size 1088762
|
||||
@ -1,75 +0,0 @@
|
||||
From 4153bcbc8e568e8e33c56bab68e9ea036c5dce5b Mon Sep 17 00:00:00 2001
|
||||
From: Kohei Yoshida <kohei.yoshida@gmail.com>
|
||||
Date: Thu, 24 Jan 2013 22:24:44 -0500
|
||||
Subject: [PATCH] bnc#798271: Don't delete the PropertyMapEntry instance
|
||||
prematurely.
|
||||
|
||||
When using comphelper::PropertyMapEntry array to create a UNO property
|
||||
set, we need to make sure we keep this instance while the property set
|
||||
object is alive, else it would cause a very hard-to-debug problem down
|
||||
the road...
|
||||
|
||||
In this particular case, the aExportInfoMap array instance was destroyed
|
||||
when it went out of scope, but the xInfoSet which references it was used
|
||||
afterward.
|
||||
|
||||
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
|
||||
---
|
||||
chart2/source/model/filter/XMLFilter.cxx | 40 +++++++++++++++-----------------
|
||||
1 file changed, 19 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
|
||||
index 2a6e35b..551e9b2 100644
|
||||
--- a/chart2/source/model/filter/XMLFilter.cxx
|
||||
+++ b/chart2/source/model/filter/XMLFilter.cxx
|
||||
@@ -644,28 +644,26 @@ sal_Int32 XMLFilter::impl_Export(
|
||||
xServiceFactory->createInstanceWithArguments(
|
||||
C2U("com.sun.star.comp.Svx.GraphicExportHelper"), aGraphicResolverArgs ), uno::UNO_QUERY );
|
||||
|
||||
- uno::Reference< beans::XPropertySet > xInfoSet;
|
||||
+ // property map for export info set
|
||||
+ comphelper::PropertyMapEntry aExportInfoMap[] =
|
||||
{
|
||||
- // property map for export info set
|
||||
- comphelper::PropertyMapEntry aExportInfoMap[] =
|
||||
- {
|
||||
- { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
|
||||
- { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
- { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
- { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
- { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
- { NULL, 0, 0, NULL, 0, 0 }
|
||||
- };
|
||||
-
|
||||
- xInfoSet = comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) );
|
||||
-
|
||||
- SvtSaveOptions aSaveOpt;
|
||||
- OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
|
||||
- sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
|
||||
- xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
|
||||
- if( ! bOasis )
|
||||
- xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true ));
|
||||
- }
|
||||
+ { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0},
|
||||
+ { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
+ { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
+ { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
+ { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
|
||||
+ { NULL, 0, 0, NULL, 0, 0 }
|
||||
+ };
|
||||
+
|
||||
+ uno::Reference< beans::XPropertySet > xInfoSet =
|
||||
+ comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) );
|
||||
+
|
||||
+ SvtSaveOptions aSaveOpt;
|
||||
+ OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
|
||||
+ sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
|
||||
+ xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) );
|
||||
+ if( ! bOasis )
|
||||
+ xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true ));
|
||||
|
||||
sal_Int32 nArgs = 2;
|
||||
if( xGraphicObjectResolver.is())
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1a1bec56d05b52a9fcc94ce7c53eb3c85defcb6b7770448d79b8be0a62e85677
|
||||
size 4906938
|
||||
3
e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
Normal file
3
e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:87081d5a81fb08e3aae88dc959aec769c4c62df44b59d5f9c0561f039cc9db6b
|
||||
size 675826
|
||||
3
f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
Normal file
3
f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e
|
||||
size 4663935
|
||||
3
fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
Normal file
3
fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bbd8b4f5a9f94cd55fd069f11bf79be9e2e290867ae7499c52930f9ac55ef2b4
|
||||
size 4859398
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
|
||||
size 547217
|
||||
@ -1,56 +0,0 @@
|
||||
--- bin/distro-install-file-lists.old 2012-07-27 14:37:04.000000000 +0200
|
||||
+++ bin/distro-install-file-lists 2012-08-09 14:22:58.000000000 +0200
|
||||
@@ -122,7 +122,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
|
||||
fi
|
||||
|
||||
- if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "Novell, Inc." ; then
|
||||
+ if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "SUSE" ; then
|
||||
# move the prebuilt icons into a hacky temporary package
|
||||
# we want to repack them into a noarch package as soon as possible
|
||||
# without the build dependency on the huge devel package
|
||||
@@ -164,7 +164,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
# lang packs
|
||||
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
|
||||
lang_lists=
|
||||
- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
|
||||
+ if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
|
||||
test -f gid_Module_Langpack_Basis_$lang && lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
|
||||
test -f gid_Module_Langpack_Brand_$lang && lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
|
||||
test -f gid_Module_Langpack_Resource_$lang && lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
|
||||
@@ -197,7 +197,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
fi
|
||||
# some help files are in _Langpack_{Writer,Impress,...}_<lang>
|
||||
# move them from -l10n to -help
|
||||
- if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
|
||||
+ if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
|
||||
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
|
||||
test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
|
||||
mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt $FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
|
||||
@@ -206,7 +206,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
fi
|
||||
done
|
||||
|
||||
- if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" != "YES" ; then
|
||||
+ if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "SUSE" -a "$SPLIT_APP_MODULES" != "YES" ; then
|
||||
cat $FILELISTSDIR/lang_en_US_list.txt >>$FILELISTSDIR/common_list.txt
|
||||
rm $FILELISTSDIR/lang_en_US_list.txt
|
||||
fi
|
||||
@@ -272,7 +272,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
add_used_directories $flist common_list.txt
|
||||
fi
|
||||
|
||||
- if test "z$OOO_VENDOR" = "zNovell, Inc." ; then
|
||||
+ if test "z$OOO_VENDOR" = "zSUSE" ; then
|
||||
# officebean subpackage
|
||||
test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell officebean_list.txt || :
|
||||
mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar
|
||||
@@ -541,7 +541,7 @@ fi
|
||||
|
||||
# mark the config files
|
||||
RPM_CONFIG_FILE_TAGS=
|
||||
-if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then
|
||||
+if test "$OOO_VENDOR" = "SUSE" -o "$OOO_VENDOR" = "RedHat"; then
|
||||
RPM_CONFIG_FILE_TAGS="%config"
|
||||
elif test "$OOO_VENDOR" = "PLD" ; then
|
||||
RPM_CONFIG_FILE_TAGS="%config(noreplace) %verify(not md5 size mtime)"
|
||||
3
libcdr-0.0.11.tar.bz2
Normal file
3
libcdr-0.0.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:213eeb7be856a97b7dc2b8bcc9af63484ea90231d950ff490e9c08cb86d8b62f
|
||||
size 687939
|
||||
3
libmspub-0.0.5.tar.bz2
Normal file
3
libmspub-0.0.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94c19838cc9c120ed04c2a5ea0c751ee74604e95b76163d1771efc6024139c25
|
||||
size 428286
|
||||
3
libreoffice-4.0.2.2.1.tar.xz
Normal file
3
libreoffice-4.0.2.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:039c48253804e5ffc73d441ff152de78f0ff8fc67155e543687fba4c5f1184ae
|
||||
size 104534248
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b5a558f79ff295ad7c0ef06b9c48c17978779f66a69d74d7136d715d51f3c46d
|
||||
size 6441587
|
||||
@ -1,3 +1,51 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1:
|
||||
* new upstream branding
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- use xz tarballs instead of bz ones
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -16,8 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: libreoffice-branding-upstream
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define lo_home libreoffice
|
||||
Summary: Original Branding for LibreOffice
|
||||
@ -34,11 +35,12 @@ Conflicts: otherproviders(libreoffice-branding)
|
||||
Supplements: packageand(branding-upstream:libreoffice)
|
||||
%endif
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
BuildRequires: xz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#!ExclusiveArch: %ix86 x86_64 ppc
|
||||
BuildArch: noarch
|
||||
#BRAND: source: libreoffice-core.tar.bz2:libreoffice-core/default_images/brand/intro.png
|
||||
#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/intro.png
|
||||
#BRAND: type: PNG image data, 440 x 286, 8-bit/color RGB, non-interlaced
|
||||
#BRAND: purpose: "splash" image displayed for a short time, when the application is launching
|
||||
#BRAND: text: should mention the app name "LibreOffice"
|
||||
@ -47,7 +49,7 @@ BuildArch: noarch
|
||||
#BRAND: the default progress bar color is 0,0,128 (blue)
|
||||
#BRAND: the progress bar has 1 pixel width white border
|
||||
#
|
||||
#BRAND: source: libreoffice-core.tar.bz2:libreoffice-core/default_images/brand/shell/about.svg
|
||||
#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/shell/about.svg
|
||||
#BRAND: type: SVG image data, 486 x 322
|
||||
#BRAND: purpose: background for the the Help/About LibreOffice dialog
|
||||
#BRAND: text: no space for text; all text is written by the application
|
||||
@ -57,7 +59,7 @@ BuildArch: noarch
|
||||
#BRAND: there are few buttons on the bottom of the dialog
|
||||
#BRAND: the text is black on a white background
|
||||
#
|
||||
#BRAND: source: libreoffice-core.tar.bz2:src/sofficerc-upstream
|
||||
#BRAND: source: libreoffice.tar.xz:src/sofficerc-upstream
|
||||
#BRAND: type: text config file (ini-files-like)
|
||||
#BRAND: purpose: defines the position, size and, color of the status bar
|
||||
|
||||
@ -68,7 +70,7 @@ office suite.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n libreoffice-core-%version
|
||||
%setup -q -n libreoffice-%version
|
||||
|
||||
%build
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56f817508bccbe4c215e980e909a1b2198c8f1d385cbbb3f6a8c96549038befc
|
||||
size 132895451
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c70332c66b4f6b534c94a8c8214cc8186dfe8d2ce5e939bc6a67774576add39d
|
||||
size 1883255
|
||||
3
libreoffice-help-4.0.2.2.1.tar.xz
Normal file
3
libreoffice-help-4.0.2.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2b981d68fa8fd62309223bcf9c2c93ff6466ff79dae5fba9ca9b28f2c4db3423
|
||||
size 1855836
|
||||
@ -1,3 +1,80 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 10 17:14:14 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -22,17 +22,13 @@ Name: libreoffice-help-en-US
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
%define zip_version 3.0
|
||||
%define lo_langs ""
|
||||
%define lo_home libreoffice
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -41,6 +37,7 @@ Release: 0
|
||||
%define prepare_build 1
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -109,9 +106,10 @@ Summary: American Help Localization for LibreOffice
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -122,8 +120,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-en-US.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-en-US
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -143,12 +146,12 @@ stuff is in LibreOffice-l10n-en-US.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
# extra fixes
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -165,82 +168,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
PARALLEL_BUILD=
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
ncpus=
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -253,9 +181,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -267,6 +193,8 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
@ -274,20 +202,17 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -295,7 +220,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -333,4 +261,5 @@ rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null
|
||||
%files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice-help-en-US
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,17 +18,13 @@
|
||||
|
||||
Name: libreoffice-help-en-US
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
%define zip_version 3.0
|
||||
%define lo_langs ""
|
||||
%define lo_home libreoffice
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -37,6 +33,7 @@ Release: 0
|
||||
%define prepare_build 1
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -105,9 +102,10 @@ Summary: American Help Localization for LibreOffice
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -118,8 +116,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-en-US.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-en-US
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -139,12 +142,12 @@ stuff is in LibreOffice-l10n-en-US.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
# extra fixes
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -161,82 +164,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
PARALLEL_BUILD=
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
ncpus=
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -249,9 +177,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -263,6 +189,8 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
@ -270,20 +198,17 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -291,7 +216,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
|
||||
@ -1,3 +1,78 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- remove unused python-devel from BuildRequires
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --disable-python: python is not longer needed for localizing sources
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group1
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -31,10 +31,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -53,6 +49,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -91,9 +87,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help
|
||||
development.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-help-ast
|
||||
Summary: Asturian Help Localization for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -329,11 +330,12 @@ is in libreoffice-l10n-en-GB.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -350,86 +352,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -442,9 +365,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -456,26 +377,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -483,7 +404,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -599,7 +523,6 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f file-lists/help_ast_list.txt -n libreoffice-help-ast
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,3 +1,78 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- remove unused python-devel from BuildRequires
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --disable-python: python is not longer needed for localizing sources
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group2
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -31,10 +31,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -53,6 +49,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -91,9 +87,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help
|
||||
development.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-help-el
|
||||
Summary: Greek Help Localization for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -317,11 +318,12 @@ is in libreoffice-l10n-fr.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -338,86 +340,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -430,9 +353,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -444,26 +365,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -471,7 +392,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -575,7 +499,6 @@ rm -f %_datadir/%lo_home/help_fr_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f file-lists/help_el_list.txt -n libreoffice-help-el
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,3 +1,78 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- remove unused python-devel from BuildRequires
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --disable-python: python is not longer needed for localizing sources
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group3
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -31,10 +31,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -53,6 +49,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -91,9 +87,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help
|
||||
development.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-help-gl
|
||||
Summary: Galician Help Localization for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -329,11 +330,12 @@ is in libreoffice-l10n-km.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -350,86 +352,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -442,9 +365,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -456,26 +377,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -483,7 +404,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -599,7 +523,6 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f file-lists/help_gl_list.txt -n libreoffice-help-gl
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,3 +1,78 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- remove unused python-devel from BuildRequires
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --disable-python: python is not longer needed for localizing sources
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group4
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -31,10 +31,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -53,6 +49,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -91,9 +87,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help
|
||||
development.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-help-ko
|
||||
Summary: Korean Help Localization for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -317,11 +318,12 @@ is in libreoffice-l10n-pt-BR.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -338,86 +340,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -430,9 +353,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -444,26 +365,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -471,7 +392,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -575,7 +499,6 @@ rm -f %_datadir/%lo_home/help_pt_BR_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f file-lists/help_ko_list.txt -n libreoffice-help-ko
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,3 +1,78 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
- split-help-buildhack-no-vcl.diff: avoid build dependency on vcl
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 16:38:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
- build_prepare.inc: share the common build preparation steps between spec files
|
||||
|
||||
* Jan 10 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
- remove unused build_module_in_parallel define
|
||||
- use xz tarballs instead of bz ones
|
||||
- remove unused python-devel from BuildRequires
|
||||
- add "xz" to BuildRequires; explicitly needed on older SUSE versions
|
||||
- remove obsolete patches:
|
||||
* build-helpcontent-do-not-check-cups.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap
|
||||
* --disable-mozilla
|
||||
* --disable-fontconfig
|
||||
* --disable-strip-solver
|
||||
* --without-stlport
|
||||
* --with-system-db
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --disable-dbus: dbus is not need for help
|
||||
* --disable-gstreamer-0-10: gstreamer is not needed for help
|
||||
* --disable-python: python is not longer needed for localizing sources
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ Name: libreoffice-help-group5
|
||||
## Generated by:
|
||||
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
|
||||
###################################################################
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -31,10 +31,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -53,6 +49,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -76,7 +73,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -91,9 +87,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -104,8 +101,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -123,7 +125,6 @@ This package provides files related to the LibreOffice help
|
||||
development.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-help-ru
|
||||
Summary: Russian Help Localization for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -344,11 +345,12 @@ is in libreoffice-l10n-zh-TW.
|
||||
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -365,86 +367,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -457,9 +380,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -471,26 +392,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -498,7 +419,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
@ -613,7 +537,6 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f file-lists/help_ru_list.txt -n libreoffice-help-ru
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice-help-group@GROUP_NUMBER@
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-group@GROUP_NUMBER@
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -27,10 +27,6 @@ Release: 0
|
||||
# test_build_langs: 1 = de and cs
|
||||
# 2 = all supported languages
|
||||
%define test_build_langs 2
|
||||
# build_module_in_parallel 0 = no
|
||||
# 1 = yes (the number is defined be the number of cpus)
|
||||
# 2,3,4... = yes (force the number of modules to be built in parallel)
|
||||
%define build_module_in_parallel 1
|
||||
# debug_build: 0 = no
|
||||
# 1 = yes (enable depency tracking, ccache)
|
||||
%define debug_build 0
|
||||
@ -49,6 +45,7 @@ Release: 0
|
||||
%endif
|
||||
#!BuildIgnore: libreoffice
|
||||
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
|
||||
BuildRequires: xz
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: automake
|
||||
@ -72,7 +69,6 @@ BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-Compress-Zlib
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: procps
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: zip
|
||||
@ -87,9 +83,10 @@ Summary: LibreOffice Help Development
|
||||
License: LGPL-3.0
|
||||
Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-core-%version.tar.bz2
|
||||
Source1: libreoffice-help-%version.tar.bz2
|
||||
Source2: libreoffice-translations-%version.tar.bz2
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
|
||||
@ -100,8 +97,13 @@ Source31: zip-%zip_version.tar.bz2
|
||||
Source200: libreoffice-help-groupX.spec.in
|
||||
Source201: lo-help-gen-spec
|
||||
Source202: lo-help-groupX
|
||||
# cups is not needed for helpcontent build
|
||||
Patch0: build-helpcontent-do-not-check-cups.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch1: bridges-missing-cxxflags.diff
|
||||
# dmake does not work with more than 64 jobs
|
||||
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
|
||||
Patch2: build-max-64-jobs.diff
|
||||
# try to avoid build depency on vcl
|
||||
Patch3: split-help-buildhack-no-vcl.diff
|
||||
#
|
||||
# Patches against zip-3.0
|
||||
Patch2000: zip-3.0-iso8859_2.patch
|
||||
@ -121,11 +123,12 @@ development.
|
||||
@SUBPACKAGES_METAINFO@
|
||||
%prep
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-core-%version
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -n libreoffice-core-%version
|
||||
%patch0
|
||||
bin/unpack-sources `pwd` %{S:1} %{S:2}
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -142,86 +145,7 @@ cd -
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %prepare_build != 0
|
||||
# first build make-3.82
|
||||
cd make-*
|
||||
CFLAGS=$RPM_OPT_FLAGS ./configure
|
||||
make %{?_smp_mflags}
|
||||
cd -
|
||||
#
|
||||
# second build zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
cd zip30
|
||||
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
|
||||
cd -
|
||||
%endif
|
||||
#
|
||||
# Parallel build settings ...
|
||||
BUILD_SCRIPT_FLAGS=
|
||||
# dmake does not work with more than 64 jobs
|
||||
lo_jobs="%{?jobs:%jobs}"
|
||||
%ifarch %arm
|
||||
%if ! 0%{?qemu_user_space_build:1}
|
||||
# native hardware is not that powerful
|
||||
lo_jobs=""
|
||||
%endif
|
||||
%endif
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
|
||||
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
|
||||
lo_jobs="64"
|
||||
fi
|
||||
# do not eat all memory
|
||||
lo_jobs_reduced=
|
||||
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
|
||||
if test `uname -i` = "x86_64" ; then
|
||||
mem_per_process=300
|
||||
else
|
||||
mem_per_process=200
|
||||
fi
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
mem_per_process=400
|
||||
%endif
|
||||
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
|
||||
max_jobs="$(($max_mem / $mem_per_process))"
|
||||
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
|
||||
test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits"
|
||||
fi
|
||||
# finally set jobs
|
||||
PARALLEL_BUILD=
|
||||
if test -n "$lo_jobs" ; then
|
||||
PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
|
||||
BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
|
||||
fi
|
||||
# parallel build of modules
|
||||
# it makes sense on machines with more CPUs
|
||||
num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
|
||||
# again reduce to 64 CPUs because of dmake
|
||||
test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
|
||||
# allow only 2 modules if there more jobs allowed in one module
|
||||
test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
|
||||
BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
|
||||
# using icecream
|
||||
if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
|
||||
PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
|
||||
fi
|
||||
%endif
|
||||
# make sure that JAVA_HOME is set correctly
|
||||
%if 0%{?suse_version}
|
||||
source /etc/profile.d/alljava.sh
|
||||
%endif
|
||||
%if 0%{?meego_version}
|
||||
export JAVA_HOME=%{java_home}
|
||||
%endif
|
||||
# use RPM_OPT_FLAGS, ...
|
||||
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
|
||||
# FIXME: genccode from the system icu is in /usr/sbin
|
||||
# FIXME: we need make-3.82 for parallel build
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
|
||||
# use the extra built zip-3.0 on older distributions
|
||||
%if %suse_version < 1140
|
||||
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
%endif
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
@ -234,9 +158,7 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-fetch-external \
|
||||
--with-external-tar="$RPM_SOURCE_DIR" \
|
||||
--with-alloc=system \
|
||||
--disable-strip-solver \
|
||||
--with-jdk-home=$JAVA_HOME \
|
||||
--with-java-target-version=1.5 \
|
||||
--with-ant-home=/usr/share/ant \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
@ -248,26 +170,26 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
--disable-evolution2 \
|
||||
--disable-gstreamer \
|
||||
--disable-opengl \
|
||||
--disable-dbus \
|
||||
--disable-gstreamer-0-10 \
|
||||
--disable-python \
|
||||
--disable-mono \
|
||||
--disable-odk \
|
||||
--without-junit \
|
||||
%if %debug_build == 0
|
||||
--disable-ccache \
|
||||
%endif
|
||||
--without-stlport \
|
||||
--disable-mozilla \
|
||||
--without-system-mozilla \
|
||||
%if %suse_version < 1210
|
||||
--without-system-icu \
|
||||
%endif
|
||||
--disable-postgresql-sdbc \
|
||||
--disable-ldap \
|
||||
--disable-cups \
|
||||
--disable-fontconfig \
|
||||
--with-system-dicts \
|
||||
--with-system-libxml \
|
||||
--with-system-openssl \
|
||||
--with-system-icu \
|
||||
--with-system-cppunit \
|
||||
--with-system-expat \
|
||||
--with-system-db \
|
||||
--with-system-boost \
|
||||
--without-system-jpeg
|
||||
%endif
|
||||
@ -275,7 +197,10 @@ export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
|
||||
make helpcontent2.all
|
||||
|
||||
%install
|
||||
. ./config_host.mk.source
|
||||
sed '/SOLARVER/!d' config_host.mk > "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
sed '/INPATH/!d' config_host.mk >> "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
. "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
rm -rf "${RPM_BUILD_ROOT}/config_host.mk.parsed"
|
||||
test -z %lo_langs && langs="en-US" || langs=%lo_langs
|
||||
mkdir -p file-lists
|
||||
for lang in $langs ; do
|
||||
|
||||
@ -1,3 +1,48 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice-icon-themes
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,8 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: libreoffice-icon-themes
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define ooo_home libreoffice
|
||||
BuildRequires: libreoffice-icon-themes-prebuilt = %version
|
||||
|
||||
@ -1,3 +1,48 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.0.0.beta1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -16,8 +16,13 @@
|
||||
#
|
||||
|
||||
|
||||
###################################################################
|
||||
## DO NOT EDIT THIS SPEC FILE
|
||||
## Generated by:
|
||||
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
|
||||
###################################################################
|
||||
Name: libreoffice-l10n
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
@ -65,7 +70,6 @@ This source package is used to build the LibreOffice artwork
|
||||
development package.
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%package -n libreoffice-l10n-af
|
||||
Summary: African Localization Files for LibreOffice
|
||||
Group: Productivity/Office/Suite
|
||||
@ -1660,8 +1664,8 @@ PreReq: grep
|
||||
PreReq: libreoffice >= 3.5
|
||||
%endif
|
||||
Requires: libreoffice = %{version}
|
||||
Provides: OpenOffice_org-sh-YU = %version
|
||||
Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res
|
||||
Provides: OpenOffice_org-sh-YU = %version
|
||||
Obsoletes: OpenOffice_org-sh-YU < %version
|
||||
# compat stuff
|
||||
Provides: OpenOffice_org-sh = %{version}
|
||||
@ -1748,8 +1752,8 @@ PreReq: libreoffice >= 3.5
|
||||
%endif
|
||||
Requires: libreoffice = %{version}
|
||||
Requires: scalable-font-ru
|
||||
Provides: OpenOffice_org-sr-CS = %version
|
||||
Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res
|
||||
Provides: OpenOffice_org-sr-CS = %version
|
||||
Obsoletes: OpenOffice_org-sr-CS < %version
|
||||
# compat stuff
|
||||
Provides: OpenOffice_org-sr = %{version}
|
||||
@ -2255,7 +2259,6 @@ rm -rf %{buildroot}
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
# af
|
||||
|
||||
%posttrans -n libreoffice-l10n-af
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_af_list.txt || true
|
||||
|
||||
@ -2266,7 +2269,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_af_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_af_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_af_list.txt.postun 2>/dev/null
|
||||
# am
|
||||
|
||||
%posttrans -n libreoffice-l10n-am
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_am_list.txt || true
|
||||
|
||||
@ -2277,7 +2279,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_am_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_am_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_am_list.txt.postun 2>/dev/null
|
||||
# ar
|
||||
|
||||
%posttrans -n libreoffice-l10n-ar
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ar_list.txt || true
|
||||
|
||||
@ -2288,7 +2289,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ar_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ar_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ar_list.txt.postun 2>/dev/null
|
||||
# as
|
||||
|
||||
%posttrans -n libreoffice-l10n-as
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_as_list.txt || true
|
||||
|
||||
@ -2299,7 +2299,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_as_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_as_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_as_list.txt.postun 2>/dev/null
|
||||
# ast
|
||||
|
||||
%posttrans -n libreoffice-l10n-ast
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ast_list.txt || true
|
||||
|
||||
@ -2310,7 +2309,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ast_list.txt %{_datadir}/%ooo_h
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ast_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ast_list.txt.postun 2>/dev/null
|
||||
# be-BY
|
||||
|
||||
%posttrans -n libreoffice-l10n-be-BY
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_be_list.txt || true
|
||||
|
||||
@ -2321,7 +2319,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_be_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_be_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_be_list.txt.postun 2>/dev/null
|
||||
# bg
|
||||
|
||||
%posttrans -n libreoffice-l10n-bg
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_bg_list.txt || true
|
||||
|
||||
@ -2332,7 +2329,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_bg_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_bg_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_bg_list.txt.postun 2>/dev/null
|
||||
# br
|
||||
|
||||
%posttrans -n libreoffice-l10n-br
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_br_list.txt || true
|
||||
|
||||
@ -2343,7 +2339,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_br_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_br_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_br_list.txt.postun 2>/dev/null
|
||||
# ca
|
||||
|
||||
%posttrans -n libreoffice-l10n-ca
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ca_list.txt || true
|
||||
|
||||
@ -2357,7 +2352,6 @@ rm -f %{_datadir}/%ooo_home/lang_ca_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 1
|
||||
|
||||
# cs
|
||||
|
||||
%posttrans -n libreoffice-l10n-cs
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cs_list.txt || true
|
||||
|
||||
@ -2371,7 +2365,6 @@ rm -f %{_datadir}/%ooo_home/lang_cs_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
# cy
|
||||
|
||||
%posttrans -n libreoffice-l10n-cy
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_cy_list.txt || true
|
||||
|
||||
@ -2382,7 +2375,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_cy_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_cy_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_cy_list.txt.postun 2>/dev/null
|
||||
# da
|
||||
|
||||
%posttrans -n libreoffice-l10n-da
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_da_list.txt || true
|
||||
|
||||
@ -2396,7 +2388,6 @@ rm -f %{_datadir}/%ooo_home/lang_da_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 1
|
||||
|
||||
# de
|
||||
|
||||
%posttrans -n libreoffice-l10n-de
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_de_list.txt || true
|
||||
|
||||
@ -2410,7 +2401,6 @@ rm -f %{_datadir}/%ooo_home/lang_de_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
# el
|
||||
|
||||
%posttrans -n libreoffice-l10n-el
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_el_list.txt || true
|
||||
|
||||
@ -2421,7 +2411,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_el_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_el_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_el_list.txt.postun 2>/dev/null
|
||||
# en-GB
|
||||
|
||||
%posttrans -n libreoffice-l10n-en-GB
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_GB_list.txt || true
|
||||
|
||||
@ -2432,7 +2421,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_GB_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_en_GB_list.txt.postun 2>/dev/null
|
||||
# en-ZA
|
||||
|
||||
%posttrans -n libreoffice-l10n-en-ZA
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_en_ZA_list.txt || true
|
||||
|
||||
@ -2443,7 +2431,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_en_ZA_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_en_ZA_list.txt.postun 2>/dev/null
|
||||
# eo
|
||||
|
||||
%posttrans -n libreoffice-l10n-eo
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eo_list.txt || true
|
||||
|
||||
@ -2454,7 +2441,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eo_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eo_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_eo_list.txt.postun 2>/dev/null
|
||||
# es
|
||||
|
||||
%posttrans -n libreoffice-l10n-es
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_es_list.txt || true
|
||||
|
||||
@ -2465,7 +2451,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_es_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_es_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_es_list.txt.postun 2>/dev/null
|
||||
# et
|
||||
|
||||
%posttrans -n libreoffice-l10n-et
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_et_list.txt || true
|
||||
|
||||
@ -2476,7 +2461,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_et_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_et_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_et_list.txt.postun 2>/dev/null
|
||||
# eu
|
||||
|
||||
%posttrans -n libreoffice-l10n-eu
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_eu_list.txt || true
|
||||
|
||||
@ -2487,7 +2471,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_eu_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_eu_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_eu_list.txt.postun 2>/dev/null
|
||||
# fi
|
||||
|
||||
%posttrans -n libreoffice-l10n-fi
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fi_list.txt || true
|
||||
|
||||
@ -2498,7 +2481,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fi_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fi_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_fi_list.txt.postun 2>/dev/null
|
||||
# fr
|
||||
|
||||
%posttrans -n libreoffice-l10n-fr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_fr_list.txt || true
|
||||
|
||||
@ -2509,7 +2491,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_fr_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_fr_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_fr_list.txt.postun 2>/dev/null
|
||||
# ga
|
||||
|
||||
%posttrans -n libreoffice-l10n-ga
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ga_list.txt || true
|
||||
|
||||
@ -2520,7 +2501,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ga_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ga_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ga_list.txt.postun 2>/dev/null
|
||||
# gd
|
||||
|
||||
%posttrans -n libreoffice-l10n-gd
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gd_list.txt || true
|
||||
|
||||
@ -2531,7 +2511,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gd_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gd_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_gd_list.txt.postun 2>/dev/null
|
||||
# gl
|
||||
|
||||
%posttrans -n libreoffice-l10n-gl
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gl_list.txt || true
|
||||
|
||||
@ -2542,7 +2521,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gl_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gl_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_gl_list.txt.postun 2>/dev/null
|
||||
# gu-IN
|
||||
|
||||
%posttrans -n libreoffice-l10n-gu-IN
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_gu_list.txt || true
|
||||
|
||||
@ -2553,7 +2531,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_gu_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_gu_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_gu_list.txt.postun 2>/dev/null
|
||||
# he
|
||||
|
||||
%posttrans -n libreoffice-l10n-he
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_he_list.txt || true
|
||||
|
||||
@ -2564,7 +2541,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_he_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_he_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_he_list.txt.postun 2>/dev/null
|
||||
# hi-IN
|
||||
|
||||
%posttrans -n libreoffice-l10n-hi-IN
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hi_list.txt || true
|
||||
|
||||
@ -2575,7 +2551,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_hi_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_hi_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_hi_list.txt.postun 2>/dev/null
|
||||
# hr
|
||||
|
||||
%posttrans -n libreoffice-l10n-hr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hr_list.txt || true
|
||||
|
||||
@ -2589,7 +2564,6 @@ rm -f %{_datadir}/%ooo_home/lang_hr_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 1
|
||||
|
||||
# hu
|
||||
|
||||
%posttrans -n libreoffice-l10n-hu
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_hu_list.txt || true
|
||||
|
||||
@ -2603,7 +2577,6 @@ rm -f %{_datadir}/%ooo_home/lang_hu_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
# id
|
||||
|
||||
%posttrans -n libreoffice-l10n-id
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_id_list.txt || true
|
||||
|
||||
@ -2614,7 +2587,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_id_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_id_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_id_list.txt.postun 2>/dev/null
|
||||
# is
|
||||
|
||||
%posttrans -n libreoffice-l10n-is
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_is_list.txt || true
|
||||
|
||||
@ -2625,7 +2597,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_is_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_is_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_is_list.txt.postun 2>/dev/null
|
||||
# it
|
||||
|
||||
%posttrans -n libreoffice-l10n-it
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_it_list.txt || true
|
||||
|
||||
@ -2639,7 +2610,6 @@ rm -f %{_datadir}/%ooo_home/lang_it_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 1
|
||||
|
||||
# ja
|
||||
|
||||
%posttrans -n libreoffice-l10n-ja
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ja_list.txt || true
|
||||
|
||||
@ -2653,7 +2623,6 @@ rm -f %{_datadir}/%ooo_home/lang_ja_list.txt.postun 2>/dev/null
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
# ka
|
||||
|
||||
%posttrans -n libreoffice-l10n-ka
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ka_list.txt || true
|
||||
|
||||
@ -2664,7 +2633,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ka_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ka_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ka_list.txt.postun 2>/dev/null
|
||||
# km
|
||||
|
||||
%posttrans -n libreoffice-l10n-km
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_km_list.txt || true
|
||||
|
||||
@ -2675,7 +2643,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_km_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_km_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_km_list.txt.postun 2>/dev/null
|
||||
# kn
|
||||
|
||||
%posttrans -n libreoffice-l10n-kn
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_kn_list.txt || true
|
||||
|
||||
@ -2686,7 +2653,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_kn_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_kn_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_kn_list.txt.postun 2>/dev/null
|
||||
# ko
|
||||
|
||||
%posttrans -n libreoffice-l10n-ko
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ko_list.txt || true
|
||||
|
||||
@ -2697,7 +2663,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ko_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ko_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ko_list.txt.postun 2>/dev/null
|
||||
# lt
|
||||
|
||||
%posttrans -n libreoffice-l10n-lt
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_lt_list.txt || true
|
||||
|
||||
@ -2708,7 +2673,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_lt_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_lt_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_lt_list.txt.postun 2>/dev/null
|
||||
# mk
|
||||
|
||||
%posttrans -n libreoffice-l10n-mk
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mk_list.txt || true
|
||||
|
||||
@ -2719,7 +2683,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mk_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mk_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_mk_list.txt.postun 2>/dev/null
|
||||
# ml
|
||||
|
||||
%posttrans -n libreoffice-l10n-ml
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ml_list.txt || true
|
||||
|
||||
@ -2730,7 +2693,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ml_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ml_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ml_list.txt.postun 2>/dev/null
|
||||
# mr
|
||||
|
||||
%posttrans -n libreoffice-l10n-mr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_mr_list.txt || true
|
||||
|
||||
@ -2741,7 +2703,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_mr_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_mr_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_mr_list.txt.postun 2>/dev/null
|
||||
# nb
|
||||
|
||||
%posttrans -n libreoffice-l10n-nb
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nb_list.txt || true
|
||||
|
||||
@ -2752,7 +2713,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nb_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nb_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_nb_list.txt.postun 2>/dev/null
|
||||
# nl
|
||||
|
||||
%posttrans -n libreoffice-l10n-nl
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nl_list.txt || true
|
||||
|
||||
@ -2763,7 +2723,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nl_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nl_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_nl_list.txt.postun 2>/dev/null
|
||||
# nn
|
||||
|
||||
%posttrans -n libreoffice-l10n-nn
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nn_list.txt || true
|
||||
|
||||
@ -2774,7 +2733,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nn_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nn_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_nn_list.txt.postun 2>/dev/null
|
||||
# nr
|
||||
|
||||
%posttrans -n libreoffice-l10n-nr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_nr_list.txt || true
|
||||
|
||||
@ -2785,7 +2743,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_nr_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_nr_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_nr_list.txt.postun 2>/dev/null
|
||||
# om
|
||||
|
||||
%posttrans -n libreoffice-l10n-om
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_om_list.txt || true
|
||||
|
||||
@ -2796,7 +2753,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_om_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_om_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_om_list.txt.postun 2>/dev/null
|
||||
# or
|
||||
|
||||
%posttrans -n libreoffice-l10n-or
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_or_list.txt || true
|
||||
|
||||
@ -2807,7 +2763,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_or_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_or_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_or_list.txt.postun 2>/dev/null
|
||||
# pa-IN
|
||||
|
||||
%posttrans -n libreoffice-l10n-pa-IN
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pa_IN_list.txt || true
|
||||
|
||||
@ -2818,7 +2773,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pa_IN_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_pa_IN_list.txt.postun 2>/dev/null
|
||||
# pl
|
||||
|
||||
%posttrans -n libreoffice-l10n-pl
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pl_list.txt || true
|
||||
|
||||
@ -2829,7 +2783,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pl_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pl_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_pl_list.txt.postun 2>/dev/null
|
||||
# pt
|
||||
|
||||
%posttrans -n libreoffice-l10n-pt
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_list.txt || true
|
||||
|
||||
@ -2840,7 +2793,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_pt_list.txt.postun 2>/dev/null
|
||||
# pt-BR
|
||||
|
||||
%posttrans -n libreoffice-l10n-pt-BR
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_pt_BR_list.txt || true
|
||||
|
||||
@ -2851,7 +2803,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_pt_BR_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_pt_BR_list.txt.postun 2>/dev/null
|
||||
# ro
|
||||
|
||||
%posttrans -n libreoffice-l10n-ro
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ro_list.txt || true
|
||||
|
||||
@ -2862,7 +2813,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ro_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ro_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ro_list.txt.postun 2>/dev/null
|
||||
# ru
|
||||
|
||||
%posttrans -n libreoffice-l10n-ru
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ru_list.txt || true
|
||||
|
||||
@ -2873,7 +2823,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ru_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ru_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ru_list.txt.postun 2>/dev/null
|
||||
# rw
|
||||
|
||||
%posttrans -n libreoffice-l10n-rw
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_rw_list.txt || true
|
||||
|
||||
@ -2884,7 +2833,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_rw_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_rw_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_rw_list.txt.postun 2>/dev/null
|
||||
# sh
|
||||
|
||||
%posttrans -n libreoffice-l10n-sh
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sh_list.txt || true
|
||||
|
||||
@ -2895,7 +2843,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sh_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sh_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_sh_list.txt.postun 2>/dev/null
|
||||
# sk
|
||||
|
||||
%posttrans -n libreoffice-l10n-sk
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sk_list.txt || true
|
||||
|
||||
@ -2906,7 +2853,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sk_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sk_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_sk_list.txt.postun 2>/dev/null
|
||||
# sl
|
||||
|
||||
%posttrans -n libreoffice-l10n-sl
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sl_list.txt || true
|
||||
|
||||
@ -2917,7 +2863,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sl_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sl_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_sl_list.txt.postun 2>/dev/null
|
||||
# sr
|
||||
|
||||
%posttrans -n libreoffice-l10n-sr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sr_list.txt || true
|
||||
|
||||
@ -2928,7 +2873,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sr_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sr_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_sr_list.txt.postun 2>/dev/null
|
||||
# ss
|
||||
|
||||
%posttrans -n libreoffice-l10n-ss
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ss_list.txt || true
|
||||
|
||||
@ -2939,7 +2883,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ss_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ss_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ss_list.txt.postun 2>/dev/null
|
||||
# st
|
||||
|
||||
%posttrans -n libreoffice-l10n-st
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_st_list.txt || true
|
||||
|
||||
@ -2950,7 +2893,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_st_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_st_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_st_list.txt.postun 2>/dev/null
|
||||
# sv
|
||||
|
||||
%posttrans -n libreoffice-l10n-sv
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_sv_list.txt || true
|
||||
|
||||
@ -2961,7 +2903,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_sv_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_sv_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_sv_list.txt.postun 2>/dev/null
|
||||
# ta
|
||||
|
||||
%posttrans -n libreoffice-l10n-ta
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ta_list.txt || true
|
||||
|
||||
@ -2972,7 +2913,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ta_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ta_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ta_list.txt.postun 2>/dev/null
|
||||
# te
|
||||
|
||||
%posttrans -n libreoffice-l10n-te
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_te_list.txt || true
|
||||
|
||||
@ -2983,7 +2923,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_te_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_te_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_te_list.txt.postun 2>/dev/null
|
||||
# tg
|
||||
|
||||
%posttrans -n libreoffice-l10n-tg
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tg_list.txt || true
|
||||
|
||||
@ -2994,7 +2933,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tg_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tg_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_tg_list.txt.postun 2>/dev/null
|
||||
# th
|
||||
|
||||
%posttrans -n libreoffice-l10n-th
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_th_list.txt || true
|
||||
|
||||
@ -3005,7 +2943,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_th_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_th_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_th_list.txt.postun 2>/dev/null
|
||||
# tr
|
||||
|
||||
%posttrans -n libreoffice-l10n-tr
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_tr_list.txt || true
|
||||
|
||||
@ -3016,7 +2953,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_tr_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_tr_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_tr_list.txt.postun 2>/dev/null
|
||||
# ts
|
||||
|
||||
%posttrans -n libreoffice-l10n-ts
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ts_list.txt || true
|
||||
|
||||
@ -3027,7 +2963,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ts_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ts_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ts_list.txt.postun 2>/dev/null
|
||||
# ug
|
||||
|
||||
%posttrans -n libreoffice-l10n-ug
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ug_list.txt || true
|
||||
|
||||
@ -3038,7 +2973,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ug_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ug_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ug_list.txt.postun 2>/dev/null
|
||||
# uk
|
||||
|
||||
%posttrans -n libreoffice-l10n-uk
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_uk_list.txt || true
|
||||
|
||||
@ -3049,7 +2983,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_uk_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_uk_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_uk_list.txt.postun 2>/dev/null
|
||||
# ve
|
||||
|
||||
%posttrans -n libreoffice-l10n-ve
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_ve_list.txt || true
|
||||
|
||||
@ -3060,7 +2993,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_ve_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_ve_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_ve_list.txt.postun 2>/dev/null
|
||||
# vi
|
||||
|
||||
%posttrans -n libreoffice-l10n-vi
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_vi_list.txt || true
|
||||
|
||||
@ -3071,7 +3003,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_vi_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_vi_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_vi_list.txt.postun 2>/dev/null
|
||||
# xh
|
||||
|
||||
%posttrans -n libreoffice-l10n-xh
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_xh_list.txt || true
|
||||
|
||||
@ -3082,7 +3013,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_xh_list.txt %{_datadir}/%ooo_ho
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_xh_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_xh_list.txt.postun 2>/dev/null
|
||||
# zh-CN
|
||||
|
||||
%posttrans -n libreoffice-l10n-zh-CN
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_CN_list.txt || true
|
||||
|
||||
@ -3093,7 +3023,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_CN_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_zh_CN_list.txt.postun 2>/dev/null
|
||||
# zh-TW
|
||||
|
||||
%posttrans -n libreoffice-l10n-zh-TW
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zh_TW_list.txt || true
|
||||
|
||||
@ -3104,7 +3033,6 @@ test "$1" = "0" && cp %{_datadir}/%ooo_home/lang_zh_TW_list.txt %{_datadir}/%ooo
|
||||
test "$1" = "0" && %{_datadir}/%ooo_home/link-to-ooo-home --unlink %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun || true
|
||||
rm -f %{_datadir}/%ooo_home/lang_zh_TW_list.txt.postun 2>/dev/null
|
||||
# zu
|
||||
|
||||
%posttrans -n libreoffice-l10n-zu
|
||||
%{_datadir}/%ooo_home/link-to-ooo-home %{_datadir}/%ooo_home/lang_zu_list.txt || true
|
||||
|
||||
@ -3117,7 +3045,6 @@ rm -f %{_datadir}/%ooo_home/lang_zu_list.txt.postun 2>/dev/null
|
||||
%endif
|
||||
|
||||
%if %test_build_langs >= 2
|
||||
|
||||
%files -f lang_af_list.txt -n libreoffice-l10n-af
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice-l10n
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Name: libreoffice-l10n
|
||||
Version: 3.6.3.2.4
|
||||
Version: 4.0.2.2.1
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bed6f380ecd2d31a9c3c2be2bb62889f434d88b4e12b0a9e6fef24d4f4ea011c
|
||||
size 144684756
|
||||
3
libreoffice-translations-4.0.2.2.1.tar.xz
Normal file
3
libreoffice-translations-4.0.2.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e29377260882a5a569941f93e49417eaaa68fe6b8fb9ce76949a0d300a5c839e
|
||||
size 128353580
|
||||
@ -1,3 +1,407 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2)
|
||||
* icon style fixes in local help
|
||||
* left margin of bullet (bnc#793414)
|
||||
* color issue in PPTX import (bnc#780830)
|
||||
* file corruption in XLSX export (fdo#49120)
|
||||
* rehash basic unit test framework (bnc#805071)
|
||||
* display the scaled font size in the toolbar (bnc#657905)
|
||||
* use number format, if available, for charts (bnc#734735)
|
||||
* only en-US help pack should contain en-US help (fdo#54278)
|
||||
* shape with background are missed in XLSX import (bnc#798309)
|
||||
* detect follow-on default member of default member object (bnc#809017)
|
||||
* change the font combo tooltip to say font is not available (fate#308255)
|
||||
- enable the MySQL connector extension on the older SUSE distros again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.2:
|
||||
* slide show mode inverts outputs (rhbz#906137)
|
||||
* splitting a table options are mixed (fdo#62670)
|
||||
* some historical dates were decremented (fdo#44286)
|
||||
* Visio document cannot be opened by Draw (fdo#62299)
|
||||
* Turkish Lira sign should precede numbers (fdo#62384)
|
||||
* left/right-only page styles and first-page (fdo#61952)
|
||||
* hangs when exporting a particular ODS to XLSX (fdo#62111)
|
||||
* crash in Danish thesaurus/spell interaction (rhbz#918938)
|
||||
* error bars values become Y-values when pasting (fdo#52159)
|
||||
* saving particular ODG file resets font formatting (fdo#61256)
|
||||
* displaying subobjects on different layers is broken (fdo#62617)
|
||||
* wrong result because 'Property Let' fails to execute (fdo#60752)
|
||||
* keep migrating more user extensions after one failed (deb#703486)
|
||||
* implement ODF export of multi-paragraph comment ranges (fdo#60769)
|
||||
* unable to save documents on Samba with Gnome VFS (fdo#54275, rhbz#895690)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 11:25:57 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Try once more and sort all the deps.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 11:19:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Use mysql-connector-cpp not mysql-connector-c++.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 20 08:21:28 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- use -fno-omit-frame-pointer globally again until LibreOffice-4.1 where
|
||||
the ordering of compilation flags is reworked; the current situation
|
||||
causes build (bridge test) failure on i586 systems
|
||||
- fix filtering of provides and requires (bnc#809449)
|
||||
- disable it on openSUSE >= 12.3 because we use system libraries there
|
||||
- system cairo and pixman are used on all systems
|
||||
- the internal librdf, libraptor, and librasqal has used -lo suffix, so
|
||||
the names do not longer cause confusion with the system libraries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.2.1:
|
||||
* faster image scaling
|
||||
* XLSX import speedup (fdo#61721)
|
||||
* several EMF+ import filter fixes
|
||||
* lost data in CSV import (fdo#57841)
|
||||
* wrong Chinese conversion (fdo#57536)
|
||||
* lost picture in PPT import (i#119513)
|
||||
* ask when removing templates (fdo#61466)
|
||||
* send document as email fails (fdo#60701)
|
||||
* autocorrect data for Catalan (fdo#61138)
|
||||
* pie chart height in XLS import (i#119989)
|
||||
* Calc crash when using Validity (fdo#58630)
|
||||
* floating tables in DOCX import (bnc#779642)
|
||||
* lost time-format in pivot table (fdo#54651)
|
||||
* more on configuration migration (fdo#57061)
|
||||
* corrupted conditional formatting (fdo#57661)
|
||||
* drawings are shown at wrong position (fdo#56272)
|
||||
* handle note export correctly in Calc (fdo#61165)
|
||||
* insert->hyperlink in Impress freeze (rhbz#915743)
|
||||
* lost content in DOCX import (fdo#53985, fdo#60789)
|
||||
* not updating accessible text interface (fdo#56031)
|
||||
* missing default Turkish currency symbol (fdo#61602)
|
||||
* broken functionality on page layout tab (fdo#61656)
|
||||
* field shows no content in page header/footer (fdo#60886)
|
||||
* several Calc error bars fixes (fdo#60253, fdo#60083, fdo#61781)
|
||||
* can't copy text from a read-only document in Calc (rhbz#916936)
|
||||
* various fixes in RTF import (fdo#53594, fdo#59638, fdo#60722, fdo#61507)
|
||||
- update libcdr to version 0.0.11:
|
||||
* various fixes in Corel Draw import (fdo#53278, fdo#54586, fdo#55366,
|
||||
fdo#59528)
|
||||
- build-max-64-jobs.diff: dmake does not work with more than 64 jobs
|
||||
- touch-no-dereference.diff: avoid race condition when delivering symlinks and
|
||||
target files into solver
|
||||
- do not longer use -fno-omit-frame-pointer globally; the problem
|
||||
is better fixed in the plain sources and the build does not fail
|
||||
any longer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- update to 4.0.1.2:
|
||||
* mouse selection of fields (fdo#59928)
|
||||
* basic EMF+ implementation (bnc#780748)
|
||||
* selected gluepoint rendering (fdo#45879)
|
||||
* Paste special of Visio object (fdo#59405)
|
||||
* corrected SVG gradient primitive (i#120616)
|
||||
* charts not plotted automatically (fdo#60488)
|
||||
* get error bar import working again (fdo#60083)
|
||||
* autofit and stretched width (fdo#55931, fdo#57956)
|
||||
* migrate even more configuration setting (fdo#57061)
|
||||
* decimal numbers in conditional formatting (fdo#60574)
|
||||
* cut&paste of conditional format (fdo#60306, fdo#60311)
|
||||
* do not extend conditional formatting automatically (fdo#60828)
|
||||
* empty paragraphs in EditEngine layouting (i#119756, fdo#59629)
|
||||
* ocMacro and ocExternal need to be recalculated on load (fdo#60977)
|
||||
- temporary use the internal libcmis on openSUSE-12.3 until
|
||||
the system one is updated to version 0.3.1
|
||||
- update libvisio to version 0.0.25:
|
||||
* better embedded binary dumping
|
||||
* initial support of page names (fdo#60433)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- update to 4.0.1.1:
|
||||
* asynchronous word-count
|
||||
* several CMIS support fixes
|
||||
* sort data points (bnc#590020)
|
||||
* spread button layout (fdo#59767)
|
||||
* copy chart leads to crash (fdo#60420)
|
||||
* several fixes of the template manager
|
||||
* faster about box rendering (fdo#59970)
|
||||
* several fixes for Impress remote control
|
||||
* several RTL fixes (fdo#42387, fdo#39370)
|
||||
* copy margins for mirrored pages (fdo#60250)
|
||||
* corrected XLSX export of functions (fdo#60087)
|
||||
* more on the configuration migration (fdo#57061)
|
||||
* copy custom styles on copy & paste (rhbz#760765)
|
||||
* horizontal scroll bar in sub windows (fdo#44582)
|
||||
* correctly calculate IMCSCH and IMSECH (fdo#60078)
|
||||
* protection and conditional formatting (fdo#58826)
|
||||
* sort autofilter popup items correctly (bnc#492440)
|
||||
* cell validation is not a special content (bnc#802350)
|
||||
* don't crash on undoing text frame removal (fdo#34548)
|
||||
* error reading file after inserting comment (fdo#60132)
|
||||
* produce all translations for desktop files (fdo#58283)
|
||||
* make MATCH() accept a single cell reference (fdo#60366)
|
||||
* enable internal entity declarations for SVG (fdo#60471)
|
||||
* repeated row heights for empty rows (fdo#59973, fdo#55621)
|
||||
* default paths for exporting documents and PDFs (bnc#777788)
|
||||
* drawing text with font size 0 causes artifacts (bnc#753462)
|
||||
* scan all columns to determine the first data row (bnc#801152)
|
||||
* cannot select directory with GNOME folder picker (rhbz#910176)
|
||||
* hide minimum password info in the password dialog (bnc#437516)
|
||||
* make it possible to update DDE links after loading (fdo#59032)
|
||||
* cell needs to be recalculated during import as well (fdo#60645)
|
||||
* crash when pasting text under outline view (fdo#51232, i#119987)
|
||||
* fontconfig support for multiple <family> in <alias> (lp#1034928)
|
||||
* export/import anchoring for XLS(X) drawing & ole objects (fdo#58360)
|
||||
* read-only position after fieldmark and before annotation (fdo#59573)
|
||||
* show style when dialog is created with existing cond. format (fdo#59778)
|
||||
* text rotation in shapes in PPTX export (fdo#34897, bnc#404221, fdo#58204)
|
||||
* recompile cells with #NAME! for English function name option (bnc#615357)
|
||||
* several RTF import fixes (fdo#48440, fdo#58646, fdo#59419, fdo#58076,
|
||||
fdo#59953)
|
||||
- update libcdr to version 0.0.10
|
||||
* use ICU to guess encoding
|
||||
* some bug fixes
|
||||
- update libmspub to version 0.0.5
|
||||
* autodetect character set for pre-unicode MSPUB versions
|
||||
* missing non-cropped images
|
||||
* default to first default character style
|
||||
* other fixes and build fixes
|
||||
- update sofficerc-upstream according to the new branding
|
||||
- bin obsolete configure-detect-icerun.diff
|
||||
|
||||
* Feb 12 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- Try to enable build on ppc64.
|
||||
|
||||
* Feb 6 2013 by pmladek@suse.com in LibreOffice:Unstable
|
||||
|
||||
- enable startup notification (bnc#796875)
|
||||
- remove obsolete unopkg calls from post install scripts; the cache
|
||||
is removed by the main package and not longer used (bnc#769448)
|
||||
- temporary add libzip-devel into BuildRequires; it can be removed
|
||||
once the fixes liborcus package is available in Factory
|
||||
|
||||
* Feb 4 2013 by pmladek@suse.com in LibreOffice:Unstable
|
||||
|
||||
- use libreoffice-branding >= 4.0 build requires; we need the optimized
|
||||
one (bnc#798268)
|
||||
- configure-detect-icerun.diff: icerun wrapper is not provided by the old
|
||||
icecream-0.9.2 on SLED11
|
||||
|
||||
* Jan 22 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.3
|
||||
* lots fixes
|
||||
- build_prepare.inc: share the common build preparation steps between
|
||||
spec files
|
||||
- use a fake build time instead of __TIME__ and __DATE__ macros to avoid
|
||||
unnecessary recompilations in the build service
|
||||
|
||||
* Jan 9 2013 by pmladek@suse.com in LibreOffice:Unstable
|
||||
|
||||
- libreoffice-branding >= 3.6 is compatible; use in Requires
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges
|
||||
|
||||
* Jan 9 2013 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.1
|
||||
* lots fixes
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta2
|
||||
* lots fixes
|
||||
|
||||
* Dec 19 2012 by tchvatal@suse.com in LibreOffice:Unstable
|
||||
|
||||
- update to 4.0.0.0.beta1:
|
||||
- General
|
||||
* experimental Gnumeric import
|
||||
* Visio and MS Publisher document import
|
||||
* experimental send documents via Bluetooth
|
||||
* Java options merged with advanced options
|
||||
* integration Content Management Systems via CMIS standard
|
||||
* import Calc data from arbitrarily structured XML content
|
||||
* lots improvements in OOXML and RTF import and export filters
|
||||
- Writer
|
||||
* easier fields selection
|
||||
* different header and footer on the first page
|
||||
* extra word boundary characters and word count options
|
||||
* attaching comments to document text ranges (fdo#38244)
|
||||
- Calc
|
||||
* enhanced chart visualisation
|
||||
* automatically rotate chart axis to better fit
|
||||
* lots conditional formatting improvements and fixes
|
||||
* support "type-ahead" search in the autofilter popup
|
||||
* increase size limit of ODF documents from 2GB to 4GB
|
||||
* export single charts as PNG or JPEG pictures (fdo#30944)
|
||||
* support multiple selections in page field of pivot table
|
||||
* better random number generation algorithm in function RAND
|
||||
* option pricing in particular barrier: OPT_BARRIER, OPT_TOUCH
|
||||
* option to toggle handling of empty strings in arithmetic expressions
|
||||
* show saved values instead of recalculating formulas in ODS and XLSX import
|
||||
* new functions as defined in ODF OpenFormula: XOR, AVERAGEIF, SUMIFS,
|
||||
AVERAGEIFS, COUNTIFS, IFERROR, and IFNA
|
||||
- Impress
|
||||
* presenter console RTL support
|
||||
* much accelerated multimedia previews
|
||||
* remote control application for Android, Linux only now
|
||||
- Draw
|
||||
* shear transformations
|
||||
* rounded caps (ends) of lines
|
||||
* better quality of page previews
|
||||
* multi-image support in ODF, for example, bitmap + SVG representation
|
||||
- Base
|
||||
* AutoFilter does not anymore treat values as patterns in forms
|
||||
* new driver to access Thunderbird address book, Linux and MAC only
|
||||
- UI
|
||||
* new templates manager
|
||||
* support Firefox Personas
|
||||
* several resizable dialogs
|
||||
* dialog for smooth image filter
|
||||
* better quality of displayed pictures
|
||||
* allow to cut&paste text from message boxes
|
||||
* style preview in the "Apply Style" combo box
|
||||
* allow to resize and recompress pictures from popup menu
|
||||
* hide and show styles in the “Styles & Formatting” dialog
|
||||
* allow to edit data with external tool in to Calc, Impress, and Draw
|
||||
- Performance
|
||||
* faster ODS, XLSX, and RTF import
|
||||
* faster and better ICU regular expression engine
|
||||
* faster saving of a new entry to a large autocorrect replacement table
|
||||
* faster import/export of slides and drawings with large numbers of shapes
|
||||
- Feature Removal / Deprecation
|
||||
* new style services
|
||||
* deprecated and removed several UNO APIs
|
||||
* convert all existing oneway API methods to plain methods
|
||||
* drop support for defining oneway methods using UNO IDL compiler
|
||||
* drop support for legacy binary StarOffice (version 1.x → 5.x) files
|
||||
* drop support for export to legacy Word and Excel (version 6.0/95) files
|
||||
- see https://wiki.documentfoundation.org/ReleaseNotes/4.0 for more details
|
||||
- remove unused MeeGo build modifications
|
||||
- remove KDE4 hack for obsolete openSUSE-11.1-Evergreen
|
||||
- use xz tarballs instead of bz ones
|
||||
- add xz into BuildRequires; explicitly needed on older SUSE versions
|
||||
- add fdupes into BuildRequies
|
||||
- add into Build Requires:
|
||||
* xz to unpack source tarballs even on older SUSE distros
|
||||
* fdups to reduce duplicities in the installed files
|
||||
* bluez-devel to support remore control using BlueTooth
|
||||
- add more system libraries into BuildRequires on openSUSE => 12.3:
|
||||
* clucene-core-devel
|
||||
* graphite2-devel
|
||||
* hyphen-devel
|
||||
* libcdr-devel
|
||||
* libcmis-devel
|
||||
* libexttextcat-devel
|
||||
* liblangtag-devel
|
||||
* libmspub-devel
|
||||
* liborcus-devel
|
||||
* libredland-devel
|
||||
* libvisio-devel
|
||||
* mdds-devel
|
||||
* mysql-connector-c++-devel
|
||||
* mythes-devel
|
||||
* ucpp
|
||||
- remove unused build_module_in_parallel and
|
||||
remove obsolete test_build_binfilters defines
|
||||
- update extensions:
|
||||
* numbertext to version 0.9.5
|
||||
* gdocs to version 3.0.1
|
||||
- update 3rd-party source tarballs:
|
||||
* postgresql to version 9.2.1
|
||||
* libcmis to version 0.3.0
|
||||
* lcms2 to version 2.4
|
||||
* graphite2 to version 1.2.0
|
||||
* libexttextcat to version 3.4.0
|
||||
* hyphen to version 2.8.4
|
||||
* libvisio to version 0.0.24
|
||||
* libwpd to version 0.9.6
|
||||
* mythes to version 1.2.3
|
||||
- removed md5sum from the 3rd-party source tarball name:
|
||||
* libcdr
|
||||
- removed obsolete libreoffice-binfilter source tarball
|
||||
- removed obsolete 3rd-party source tarballs:
|
||||
* bj
|
||||
* lucene
|
||||
* librsvg
|
||||
* SampleICC
|
||||
- add new 3rd-party tarballs:
|
||||
* ucpp, version 1.3.2:
|
||||
* C preprocessor compliant to ISO-C99
|
||||
* liblangtag, version 0.4.0:
|
||||
* access tags for identifying languages
|
||||
* icu, version 4c-49.1.1:
|
||||
* icu data subset, version 49l:
|
||||
* International Components for Unicode
|
||||
* liborcus version 0.3.0:
|
||||
* library for processing spreadsheet documents
|
||||
* libmspub-0.0.3:
|
||||
* MS Publisher format import
|
||||
- bin obsolete patches:
|
||||
* pack-addressbook.diff
|
||||
* sdext-poppler-0.21.0.diff
|
||||
* sdext-poppler-0.21.1.diff
|
||||
* install-with-vendor-SUSE.diff
|
||||
* solenv-java-source-version.diff
|
||||
* split-icons-search-usr-share.diff
|
||||
* scripting-prefer-internal-rhino.diff
|
||||
* sdext-disable-failing-xpdf-test.diff
|
||||
* libreoffice-poppler-0.17.0-reject-fix.diff
|
||||
* do-not-delete-PropertyMapEntry-instance.diff
|
||||
* officecfg-defaul-export-ms-file-formats.diff
|
||||
* pack-desktop-files-for-optional-filters.diff
|
||||
- system-python-ure-bootstrap.diff and pyuno-path.diff merged into
|
||||
system-pyuno.diff
|
||||
- remove obsolete configure switches:
|
||||
* --disable-ldap \
|
||||
* --disable-mozilla \
|
||||
* --enable-xmlsec \
|
||||
* --enable-binfilter
|
||||
* --disable-strip-solver
|
||||
* --without-stlport \
|
||||
* --without-system-mozilla \
|
||||
* --with-openldap \
|
||||
* --with-java-target-version=1.5
|
||||
- use configure switches:
|
||||
* --enable-release-build: use the "LibreOffice" name for the final product
|
||||
* --enable-merge-libs: linking of big merged libraries
|
||||
* --enable-python=system: make sure that we use the system Python
|
||||
* --without-system-icu: system ICU is too old on openSUSE < 12.1
|
||||
* --enable-scripting-beanshell: renamed from
|
||||
--enable-ext-scripting-beanshell
|
||||
* --enable-scripting-javascript: renamed from
|
||||
--enable-ext-scripting-javascript
|
||||
* --without-system-npapi-headers: renamed from
|
||||
--without-system-mozilla-headers
|
||||
- use more configure switches because some system libraries are not useful on
|
||||
openSUSE < 12.3:
|
||||
* --with-system-ucpp
|
||||
* --without-system-altlinuxhyph
|
||||
* --without-system-clucene
|
||||
* --without-system-graphite
|
||||
* --without-system-libcdr
|
||||
* --without-system-libcmis
|
||||
* --without-system-libexttextcat
|
||||
* --without-system-liblangtag
|
||||
* --without-system-libmspub
|
||||
* --without-system-libvisio
|
||||
* --without-system-mythes
|
||||
* --without-system-mysql-cppconn
|
||||
* --without-system-orcus
|
||||
* --without-system-redland
|
||||
* --without-system-servlet-api
|
||||
- reduce duplicities by fdupes
|
||||
- Python script provider, PDF Import, and Presenter Screen are not longer
|
||||
extensions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 20 11:35:25 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
635
libreoffice.spec
635
libreoffice.spec
File diff suppressed because it is too large
Load Diff
3
libvisio-0.0.25.tar.bz2
Normal file
3
libvisio-0.0.25.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fa57b8012778154ffc798eed4d33ae171f91dafc2f9b2efb092399b93a0725d6
|
||||
size 480885
|
||||
@ -1,8 +1,3 @@
|
||||
# hide some private libraries from provides
|
||||
grep -v -e libraptor.so \
|
||||
-e librasqal.so \
|
||||
-e librdf.so \
|
||||
-e libmysqlcppconn.so \
|
||||
-e libcairo.so.2 \
|
||||
-e libpixman-1.so.0 \
|
||||
grep -v -e libmysqlcppconn.so \
|
||||
| /usr/lib/rpm/find-provides “$@”
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
# do not require some internal libraries
|
||||
/usr/lib/rpm/find-requires “$@” | \
|
||||
grep -v -e libraptor.so \
|
||||
-e librasqal.so \
|
||||
-e librdf.so \
|
||||
-e libmysqlcppconn.so \
|
||||
-e libpixman-1.so.0
|
||||
grep -v -e libmysqlcppconn.so
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- swext/mediawiki/src/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
|
||||
+++ swext/mediawiki/src/manifest.xml 2012-03-30 16:56:56.000000000 +0200
|
||||
--- swext/mediawiki/src/META-INF/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
|
||||
+++ swext/mediawiki/src/META-INF/manifest.xml 2012-03-30 16:56:56.000000000 +0200
|
||||
@@ -46,6 +46,4 @@
|
||||
manifest:full-path="Types.xcu"/>
|
||||
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
|
||||
+++ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml 2012-03-30 16:44:37.000000000 +0200
|
||||
--- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
|
||||
+++ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml 2012-03-30 16:44:37.000000000 +0200
|
||||
@@ -2,8 +2,6 @@
|
||||
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
|
||||
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- officecfg/registry/data/org/openoffice/Setup.xcu.old 2010-06-14 13:23:57.000000000 +0200
|
||||
+++ officecfg/registry/data/org/openoffice/Setup.xcu 2010-06-15 17:36:47.000000000 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
<value >calc8_template</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryDefaultFilter">
|
||||
- <value >calc8</value>
|
||||
+ <value >MS Excel 97</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryEmptyDocumentURL" oor:finalized="true">
|
||||
<value >private:factory/scalc</value>
|
||||
@@ -154,7 +154,7 @@
|
||||
<value>impress8_template</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryDefaultFilter">
|
||||
- <value >impress8</value>
|
||||
+ <value >MS PowerPoint 97</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryEmptyDocumentURL" oor:finalized="true">
|
||||
<value >private:factory/simpress</value>
|
||||
@@ -273,7 +273,7 @@
|
||||
<value>writer8_template</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryDefaultFilter">
|
||||
- <value >writer8</value>
|
||||
+ <value >MS Word 97</value>
|
||||
</prop>
|
||||
<prop oor:name="ooSetupFactoryEmptyDocumentURL" oor:finalized="true">
|
||||
<value >private:factory/swriter</value>
|
||||
@ -1,22 +0,0 @@
|
||||
--- bin/distro-install-file-lists.old 2012-11-05 21:12:36.000000000 +0100
|
||||
+++ bin/distro-install-file-lists 2012-11-06 14:05:45.000000000 +0100
|
||||
@@ -222,7 +222,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/tdefilepicker
|
||||
mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/fps_tde.uno.so
|
||||
mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_tdel..so
|
||||
- mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1.so
|
||||
+ mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeab1l..so
|
||||
+ mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so
|
||||
add_used_directories tde_list.txt common_list.txt
|
||||
|
||||
# kde subpackage
|
||||
@@ -230,7 +231,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
|
||||
mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
|
||||
mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kde.uno.so
|
||||
mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so
|
||||
- mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1.so
|
||||
+ mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so
|
||||
+ mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so
|
||||
add_used_directories kde_list.txt common_list.txt
|
||||
|
||||
# create kde4 subpackage
|
||||
@ -1,9 +1,8 @@
|
||||
Index: bin/distro-install-desktop-integration
|
||||
===================================================================
|
||||
--- bin/distro-install-desktop-integration.orig
|
||||
+++ bin/distro-install-desktop-integration
|
||||
@@ -172,6 +172,10 @@ add_wrapper unopkg unopkg ""
|
||||
test -f $DESTDIR/gid_Module_Optional_Binfilter && echo "$PREFIXDIR/share/applications/libreoffice-binfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Binfilter"
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration
|
||||
--- libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration 2012-12-17 12:47:12.343137682 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration 2012-12-17 12:53:56.520100212 +0100
|
||||
@@ -168,6 +168,10 @@
|
||||
# there are two more desktop files for optional filters
|
||||
test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
|
||||
|
||||
+# there are two more desktop files for optional filters
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- pyuno/source/module/uno.py 2011-11-30 18:39:37 -0500
|
||||
+++ pyuno/source/module/uno.py 2011-11-30 19:38:14 -0500
|
||||
@@ -26,6 +26,12 @@
|
||||
#*************************************************************************
|
||||
import os
|
||||
import sys
|
||||
+import platform
|
||||
+
|
||||
+if platform.machine() == 'x86_64':
|
||||
+ sys.path.append('/usr/lib64/libreoffice/program')
|
||||
+else:
|
||||
+ sys.path.append('/usr/lib/libreoffice/program')
|
||||
|
||||
if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
||||
os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
|
||||
@ -1,8 +1,21 @@
|
||||
Index: solenv/gbuild/Jar.mk
|
||||
===================================================================
|
||||
--- solenv/gbuild/Jar.mk.orig
|
||||
+++ solenv/gbuild/Jar.mk
|
||||
@@ -201,6 +201,11 @@ $$(call gb_Output_error,\
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk
|
||||
--- libreoffice-4.0.0.0.beta1.old/scripting/Jar_ScriptProviderForJavaScript.mk 2012-12-17 12:47:10.021137898 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/scripting/Jar_ScriptProviderForJavaScript.mk 2012-12-17 12:56:29.405086038 +0100
|
||||
@@ -40,6 +40,10 @@
|
||||
rhino \
|
||||
))
|
||||
|
||||
+$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\
|
||||
+ $(OUTDIR)/bin/js.jar \
|
||||
+))
|
||||
+
|
||||
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
|
||||
|
||||
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk
|
||||
--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/Jar.mk 2012-12-17 12:47:09.394137956 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/solenv/gbuild/Jar.mk 2012-12-17 12:56:29.404086038 +0100
|
||||
@@ -214,6 +214,11 @@
|
||||
gb_Jar_add_jars: use gb_Jar_use_jars instead.)
|
||||
endef
|
||||
|
||||
@ -13,25 +26,23 @@ Index: solenv/gbuild/Jar.mk
|
||||
+
|
||||
# specify jars with imported modules
|
||||
define gb_Jar_use_jars
|
||||
$(call gb_JavaClassSet_use_jars,$(call gb_Jar_get_classsetname,$(1)),$(2))
|
||||
Index: solenv/gbuild/JavaClassSet.mk
|
||||
===================================================================
|
||||
--- solenv/gbuild/JavaClassSet.mk.orig
|
||||
+++ solenv/gbuild/JavaClassSet.mk
|
||||
@@ -46,6 +46,8 @@ $(call gb_Helper_abbreviate_dirs,\
|
||||
$(foreach jar,$(2),$(call gb_Jar_use_jar,$(1),$(jar)))
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk
|
||||
--- libreoffice-4.0.0.0.beta1.old/solenv/gbuild/JavaClassSet.mk 2012-12-17 12:47:09.393137956 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/solenv/gbuild/JavaClassSet.mk 2012-12-17 12:58:28.659074982 +0100
|
||||
@@ -47,6 +47,8 @@
|
||||
$(filter-out $(JARDEPS),$(4))) && \
|
||||
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
|
||||
$(gb_JavaClassSet_JAVACDEBUG) \
|
||||
+ $(gb_JavaClassSet_XBOOTCLASSPATH) \
|
||||
+ -Xbootclasspath/p:$(XBOOT_CP_P) \
|
||||
-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
||||
-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
||||
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
||||
@$$RESPONSEFILE &&) \
|
||||
@@ -112,6 +114,18 @@ $$(call gb_Output_error,\
|
||||
@@ -118,6 +120,17 @@
|
||||
gb_JavaClassSet_add_jar: use gb_JavaClassSet_use_jar instead.)
|
||||
endef
|
||||
|
||||
+
|
||||
+# Xbootclasspath
|
||||
+define gb_JavaClassSet_prepend_xboot_jar
|
||||
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
|
||||
@ -43,21 +54,6 @@ Index: solenv/gbuild/JavaClassSet.mk
|
||||
+$(foreach jar,$(2),$(call gb_JavaClassSet_prepend_xboot_jar,$(1),$(jar)))
|
||||
+endef
|
||||
+
|
||||
# problem: currently we can't get these dependencies to work
|
||||
# build order dependency is a hack to get these prerequisites out of the way in the build command
|
||||
define gb_JavaClassSet_use_jar
|
||||
Index: scripting/Jar_ScriptProviderForJavaScript.mk
|
||||
===================================================================
|
||||
--- scripting/Jar_ScriptProviderForJavaScript.mk.orig
|
||||
+++ scripting/Jar_ScriptProviderForJavaScript.mk
|
||||
@@ -40,6 +40,10 @@ $(eval $(call gb_Jar_use_externals,Scrip
|
||||
rhino \
|
||||
))
|
||||
|
||||
+$(eval $(call gb_Jar_prepend_xboot_jars,ScriptProviderForJavaScript,\
|
||||
+ $(OUTDIR)/bin/js.jar \
|
||||
+))
|
||||
+
|
||||
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
|
||||
|
||||
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \
|
||||
ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
|
||||
$$(eval $$(call gb_Output_info,currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL))
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
--- sdext/source/pdfimport/test/tests.cxx.old 2012-06-19 17:10:50.000000000 +0200
|
||||
+++ sdext/source/pdfimport/test/tests.cxx 2012-06-21 14:21:40.000000000 +0200
|
||||
@@ -125,12 +125,16 @@ namespace
|
||||
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height" , m_aPageSize.Height, 59500, 0.0000001 );
|
||||
CPPUNIT_ASSERT_MESSAGE( "endPage() called", m_bPageEnded );
|
||||
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Num pages equal one", m_nNumPages, (sal_Int32) 1 );
|
||||
- CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
|
||||
- rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
|
||||
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") );
|
||||
+ printf ("m_aHyperlinkBounds.X1 = %d\n", m_aHyperlinkBounds.X1);
|
||||
+ printf ("m_aHyperlinkBounds.Y1 = %d\n", m_aHyperlinkBounds.Y1);
|
||||
+ printf ("m_aHyperlinkBounds.X2 = %d\n", m_aHyperlinkBounds.X2);
|
||||
+ printf ("m_aHyperlinkBounds.Y2 = %d\n", m_aHyperlinkBounds.Y2);
|
||||
+// CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
|
||||
+// rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 ) &&
|
||||
+// rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0) &&
|
||||
+// rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
|
||||
+// rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
|
||||
+// CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI", m_aURI, ::rtl::OUString("http://download.openoffice.org/") );
|
||||
|
||||
const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n"
|
||||
"Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n";
|
||||
@ -1,14 +0,0 @@
|
||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2012-10-15 15:45:49.000000000 +0200
|
||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2012-10-31 11:55:44.000000000 +0100
|
||||
@@ -46,7 +46,11 @@
|
||||
#pragma warning(push, 1)
|
||||
#endif
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 21, 0)
|
||||
+#include "UTF.h"
|
||||
+#else
|
||||
#include "UTF8.h"
|
||||
+#endif
|
||||
|
||||
#if defined __SUNPRO_CC
|
||||
#pragma enable_warn
|
||||
@ -1,33 +0,0 @@
|
||||
From 445d88ee22bb5bfbe2c42b5618734b9661defd3d Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mladek <pmladek@suse.cz>
|
||||
Date: Wed, 21 Nov 2012 17:37:26 +0100
|
||||
Subject: [PATCH] fix build with poppler-0.21.1
|
||||
|
||||
heh, they put back UTF8.h
|
||||
|
||||
Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa
|
||||
---
|
||||
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index 7adc487..765d0be 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -34,7 +34,12 @@
|
||||
#pragma warning(push, 1)
|
||||
#endif
|
||||
|
||||
-#if POPPLER_CHECK_VERSION(0, 21, 0)
|
||||
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
|
||||
+// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
|
||||
+// because the internal poppler does not provide poppler-version.h and the macro always returns 0
|
||||
+#if POPPLER_CHECK_VERSION(0, 21, 1)
|
||||
+#include "UTF8.h"
|
||||
+#elif POPPLER_CHECK_VERSION(0, 21, 0)
|
||||
#include "UTF.h"
|
||||
#else
|
||||
#include "UTF8.h"
|
||||
--
|
||||
1.7.12.3
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
HideEula=1
|
||||
Logo=1
|
||||
NativeProgress=false
|
||||
ProgressBarColor=255,255,255
|
||||
ProgressFrameColor=20,136,3
|
||||
ProgressPosition=61,317
|
||||
ProgressSize=407,6
|
||||
ProgressTextBaseline=287
|
||||
ProgressBarColor=128,128,128
|
||||
ProgressFrameColor=245,245,245
|
||||
ProgressPosition=72,189
|
||||
ProgressSize=409,8
|
||||
ProgressTextBaseline=170
|
||||
ProgressTextColor=255,255,255
|
||||
URE_BOOTSTRAP=${ORIGIN}/fundamentalrc
|
||||
|
||||
@ -9,5 +9,5 @@ Index: solenv/gbuild/JavaClassSet.mk
|
||||
+ -source $(JAVA_SOURCE_VER) \
|
||||
+ -target $(JAVA_TARGET_VER) \
|
||||
-Xbootclasspath/p:$(XBOOT_CP_P) \
|
||||
-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
||||
-classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
|
||||
-d $(call gb_JavaClassSet_get_classdir,$(2)) \
|
||||
|
||||
17
split-help-buildhack-no-vcl.diff
Normal file
17
split-help-buildhack-no-vcl.diff
Normal file
@ -0,0 +1,17 @@
|
||||
--- xmlhelp/prj/build.lst.old 2013-04-16 18:12:49.000000000 +0200
|
||||
+++ xmlhelp/prj/build.lst 2013-04-16 18:18:33.000000000 +0200
|
||||
@@ -1,3 +1,3 @@
|
||||
-xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools vcl NULL
|
||||
+xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil javaunohelper DESKTOP:l10ntools DESKTOP:helpcompiler unotools NULL
|
||||
xh xmlhelp usr1 - all xh_mkout NULL
|
||||
xh xmlhelp\prj nmake - all xh_prj NULL
|
||||
--- xmlhelp/Module_xmlhelp.mk.old 2013-04-16 09:46:01.000000000 +0200
|
||||
+++ xmlhelp/Module_xmlhelp.mk 2013-04-16 18:12:00.000000000 +0200
|
||||
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_Module,xmlhelp))
|
||||
|
||||
$(eval $(call gb_Module_add_targets,xmlhelp,\
|
||||
Library_tvhlp1 \
|
||||
- Library_ucpchelp1 \
|
||||
Package_xsl \
|
||||
Zip_helpxsl \
|
||||
))
|
||||
@ -1,8 +1,29 @@
|
||||
Index: vcl/source/gdi/impimagetree.cxx
|
||||
===================================================================
|
||||
--- vcl/source/gdi/impimagetree.cxx.orig
|
||||
+++ vcl/source/gdi/impimagetree.cxx
|
||||
@@ -156,7 +156,16 @@ void loadFromStream(
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx
|
||||
--- libreoffice-4.0.0.0.beta1.old/vcl/inc/impimagetree.hxx 2012-12-17 12:47:09.692137928 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/vcl/inc/impimagetree.hxx 2012-12-17 12:48:30.214130463 +0100
|
||||
@@ -76,6 +76,10 @@
|
||||
typedef boost::unordered_map<
|
||||
rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
|
||||
|
||||
+ // we want to search zip files (icons) also in /usr/share/
|
||||
+ ::rtl::OUString m_datadir; // /usr/share/
|
||||
+ ::rtl::OUString m_libdir; // /usr/lib or /usr/lib64
|
||||
+
|
||||
rtl::OUString m_style;
|
||||
Paths m_paths;
|
||||
CheckStyleCache m_checkStyleCache;
|
||||
@@ -84,6 +88,7 @@
|
||||
|
||||
void setStyle(rtl::OUString const & style );
|
||||
|
||||
+ void addUrlToPaths(const rtl::OUString &url);
|
||||
void resetPaths();
|
||||
|
||||
bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists );
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx
|
||||
--- libreoffice-4.0.0.0.beta1.old/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:47:09.685137929 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/vcl/source/gdi/impimagetree.cxx 2012-12-17 12:48:30.214130463 +0100
|
||||
@@ -146,7 +146,16 @@
|
||||
|
||||
}
|
||||
|
||||
@ -20,7 +41,7 @@ Index: vcl/source/gdi/impimagetree.cxx
|
||||
|
||||
ImplImageTree::~ImplImageTree() {}
|
||||
|
||||
@@ -297,6 +306,22 @@ void ImplImageTree::setStyle(rtl::OUStri
|
||||
@@ -288,6 +297,22 @@
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,7 +64,7 @@ Index: vcl/source/gdi/impimagetree.cxx
|
||||
void ImplImageTree::resetPaths() {
|
||||
m_paths.clear();
|
||||
{
|
||||
@@ -305,10 +330,7 @@ void ImplImageTree::resetPaths() {
|
||||
@@ -296,10 +321,7 @@
|
||||
rtl::Bootstrap::expandMacros(url);
|
||||
INetURLObject u(url);
|
||||
OSL_ASSERT(!u.HasError());
|
||||
@ -55,7 +76,7 @@ Index: vcl/source/gdi/impimagetree.cxx
|
||||
}
|
||||
{
|
||||
rtl::OUString url(
|
||||
@@ -322,17 +344,12 @@ void ImplImageTree::resetPaths() {
|
||||
@@ -313,17 +335,12 @@
|
||||
b.appendAscii(RTL_CONSTASCII_STRINGPARAM("_brand"));
|
||||
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
|
||||
OSL_ASSERT(ok); (void) ok;
|
||||
@ -75,7 +96,7 @@ Index: vcl/source/gdi/impimagetree.cxx
|
||||
}
|
||||
{
|
||||
rtl::OUString url(
|
||||
@@ -345,18 +362,13 @@ void ImplImageTree::resetPaths() {
|
||||
@@ -336,18 +353,13 @@
|
||||
b.append(m_style);
|
||||
bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
|
||||
OSL_ASSERT(ok); (void) ok;
|
||||
@ -96,34 +117,10 @@ Index: vcl/source/gdi/impimagetree.cxx
|
||||
}
|
||||
}
|
||||
|
||||
Index: vcl/inc/impimagetree.hxx
|
||||
===================================================================
|
||||
--- vcl/inc/impimagetree.hxx.orig
|
||||
+++ vcl/inc/impimagetree.hxx
|
||||
@@ -85,6 +85,10 @@ private:
|
||||
typedef boost::unordered_map<
|
||||
rtl::OUString, std::pair< bool, BitmapEx >, rtl::OUStringHash > IconCache;
|
||||
|
||||
+ // we want to search zip files (icons) also in /usr/share/
|
||||
+ ::rtl::OUString m_datadir; // /usr/share/
|
||||
+ ::rtl::OUString m_libdir; // /usr/lib or /usr/lib64
|
||||
+
|
||||
rtl::OUString m_style;
|
||||
Paths m_paths;
|
||||
CheckStyleCache m_checkStyleCache;
|
||||
@@ -93,6 +97,7 @@ private:
|
||||
|
||||
void setStyle(rtl::OUString const & style );
|
||||
|
||||
+ void addUrlToPaths(const rtl::OUString &url);
|
||||
void resetPaths();
|
||||
|
||||
bool checkStyleCacheLookup( rtl::OUString const & style, bool &exists );
|
||||
Index: xmlhelp/source/cxxhelp/provider/provider.cxx
|
||||
===================================================================
|
||||
--- xmlhelp/source/cxxhelp/provider/provider.cxx.orig
|
||||
+++ xmlhelp/source/cxxhelp/provider/provider.cxx
|
||||
@@ -334,7 +334,7 @@ void ContentProvider::init()
|
||||
diff -urN libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx
|
||||
--- libreoffice-4.0.0.0.beta1.old/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:47:12.392137678 +0100
|
||||
+++ libreoffice-4.0.0.0.beta1/xmlhelp/source/cxxhelp/provider/provider.cxx 2012-12-17 12:48:30.214130463 +0100
|
||||
@@ -326,7 +326,7 @@
|
||||
rtl::OUString( " " ) +
|
||||
setupextension );
|
||||
|
||||
@ -132,7 +129,7 @@ Index: xmlhelp/source/cxxhelp/provider/provider.cxx
|
||||
xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" );
|
||||
|
||||
rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
|
||||
@@ -343,6 +343,19 @@ void ContentProvider::init()
|
||||
@@ -335,6 +335,19 @@
|
||||
|
||||
aPath = rtl::OUString("$BRAND_BASE_DIR/share/config");
|
||||
rtl::Bootstrap::expandMacros(aPath);
|
||||
@ -151,4 +148,4 @@ Index: xmlhelp/source/cxxhelp/provider/provider.cxx
|
||||
+ aPath = aPath.replaceAt( nLibDirPos, aLibDir.getLength(), aDataDir );
|
||||
aImagesZipPaths[ 1 ] = aPath;
|
||||
|
||||
uno::Reference< uno::XComponentContext > xContext;
|
||||
sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- pyuno/source/module/uno.py.old 2012-02-24 16:34:51.000000000 +0100
|
||||
+++ pyuno/source/module/uno.py 2012-03-01 15:56:27.000000000 +0100
|
||||
@@ -26,8 +26,12 @@
|
||||
# for a copy of the LGPLv3 License.
|
||||
#
|
||||
#*************************************************************************
|
||||
+import os
|
||||
import sys
|
||||
|
||||
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
||||
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
|
||||
+
|
||||
import pyuno
|
||||
|
||||
try:
|
||||
41
system-pyuno.diff
Normal file
41
system-pyuno.diff
Normal file
@ -0,0 +1,41 @@
|
||||
diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh
|
||||
--- libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh 2012-12-19 19:09:46.518989541 +0100
|
||||
+++ libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh 2012-12-19 19:10:21.810986269 +0100
|
||||
@@ -120,6 +120,9 @@
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
|
||||
+export PYTHONPATH
|
||||
+
|
||||
case "`uname -s`" in
|
||||
NetBSD|OpenBSD|FreeBSD|DragonFly)
|
||||
# this is a temporary hack until we can live with the default search paths
|
||||
diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py
|
||||
--- libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py 2012-12-19 19:09:49.483989266 +0100
|
||||
+++ libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py 2012-12-19 19:10:21.810986269 +0100
|
||||
@@ -16,8 +16,12 @@
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
+import os
|
||||
import sys
|
||||
|
||||
+sys.path.append('@INSTALLDIR@/program')
|
||||
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
||||
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
|
||||
import pyuno
|
||||
|
||||
try:
|
||||
diff -urN libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py
|
||||
--- libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py 2012-12-19 19:09:46.868989508 +0100
|
||||
+++ libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py 2012-12-19 19:10:21.810986269 +0100
|
||||
@@ -44,7 +44,7 @@
|
||||
if "UNO_PATH" in os.environ:
|
||||
sOffice = os.environ["UNO_PATH"]
|
||||
else:
|
||||
- sOffice = "" # lets hope for the best
|
||||
+ sOffice = "@INSTALLDIR@/program"
|
||||
sOffice = os.path.join(sOffice, "soffice")
|
||||
if platform.startswith("win"):
|
||||
sOffice += ".exe"
|
||||
37
touch-no-dereference.diff
Normal file
37
touch-no-dereference.diff
Normal file
@ -0,0 +1,37 @@
|
||||
From b03773728e53a83715d338b021f60375aed06bb9 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mladek <pmladek@suse.cz>
|
||||
Date: Tue, 19 Mar 2013 14:38:58 +0100
|
||||
Subject: [PATCH] fix race condition when using hardlinks to deliver into
|
||||
solver
|
||||
|
||||
We need to use "touch --no-dereference" on the delivered files.
|
||||
Otherwise, it creates empty target file when you touch symlinks and
|
||||
delivering the real target file might fail.
|
||||
|
||||
This caused many build failures when delivering:
|
||||
|
||||
liblcms2.so -> liblcms2.so.2.0.4
|
||||
liblcms2.so.2 -> liblcms2.so.2.0.4
|
||||
liblcms2.so.2.0.4
|
||||
|
||||
Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935
|
||||
---
|
||||
solenv/gbuild/Deliver.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
|
||||
index 0f257e5..ab56dab 100644
|
||||
--- a/solenv/gbuild/Deliver.mk
|
||||
+++ b/solenv/gbuild/Deliver.mk
|
||||
@@ -60,7 +60,7 @@ endif
|
||||
endef
|
||||
|
||||
define gb_Deliver__deliver
|
||||
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
|
||||
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
|
||||
endef
|
||||
|
||||
ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
|
||||
--
|
||||
1.8.1.3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user