Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 5.4.3.1

Browse source
This commit is contained in:
Алзим 2017-11-02 23:28:47 +03:00
parent 4706155804
commit e4153d25a0
3 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.abf.yml
View file

@ -24,8 +24,8 @@ sources:
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c
b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389
commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6
libreoffice-5.4.3.1.tar.xz: ce2fe99c29f1cb342e2aeccd36a566be8057b8bf
libreoffice-dictionaries-5.4.3.1.tar.xz: d86a8c98628ffc6cf84bb5b186c5131d3667fbbb
libreoffice-help-5.4.3.1.tar.xz: e38b1bc50de94ce9b58b809ab429b2b3f2b9af4f
libreoffice-translations-5.4.3.1.tar.xz: 1c678497e9f9d8eb4b8a6190b7b53cecd6bd9ef4
pdfium-3064.tar.bz2: 70135df62d10db3471054bd29fb9bf48d8bc5b7c
libreoffice-5.4.2.1.tar.xz: fd34a0c7c26496fa2a9bdaf2fc06403abb864ad0
libreoffice-dictionaries-5.4.2.1.tar.xz: e292ccc2047a5b8c7fd2f6692738f8a5c345c6b5
libreoffice-help-5.4.2.1.tar.xz: cd0d531b09cdb32ab27c212abe6422c3ba665aaf
libreoffice-translations-5.4.2.1.tar.xz: 6be428752071c77ea99644a6efb76908484b07d7

4
libreoffice.rpmlintrc
View file

@ -6,4 +6,6 @@ addFilter("E: zero-length")
addFilter("E: incoherent-version-in-name")
#false positive
addFilter("E: no-dependency-on")
addFilter("W: jar-not-indexed")
addFilter("W: invalid-license")
addFilter("W: devel-file-in-non-devel-package")

29
libreoffice.spec
View file

@ -41,7 +41,7 @@
Summary: Office suite
Name: libreoffice
Epoch: 1
Version: 5.4.2
Version: 5.4.3
Release: 1
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Office
@ -228,7 +228,6 @@ BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-lang
# BuildRequires: hsqldb1.8.0
BuildRequires: jakarta-commons-httpclient
BuildRequires: junit
BuildRequires: java-1.8.0-openjdk-devel
@ -2922,10 +2921,6 @@ chmod 777 ~/tmp
chmod +x bin/unpack-sources
%build
# Workaround for bug http://qa.mandriva.com/show_bug.cgi?id=27771
# if [ -z $QTDIR ]; then
# . /etc/profile.d/60qt4.sh
# fi
export QT4DIR=%{_libdir}/qt4
%ifarch X86_64
export QT4INC=/usr/lib/qt4/include
@ -2946,8 +2941,6 @@ export LC_ALL=en_US.UTF-8
export LANG=en_US
%if !%{with icecream}
# sbin due to icu stuff there
#PATH=/bin:/usr/bin:/usr/X11R6/bin:$QTPATH:/usr/sbin:$PATH
PATH=$PATH:/usr/sbin
export PATH
%endif
@ -3004,7 +2997,6 @@ touch autogen.lastrun
--enable-ext-nlpsolver \
--enable-ext-languagetool \
--enable-ext-wiki-publisher \
--enable-verbose \
--enable-ext-mariadb-connector \
%if %{with ccache} && !%{with icecream}
--with-gcc-speedup=ccache \
@ -3055,7 +3047,6 @@ ln -sf %{SOURCE37} external/tarballs/
cp %{SOURCE49} external/tarballs/
ln -sf %{SOURCE51} external/tarballs/
ln -sf %{SOURCE53} external/tarballs/
ln -sf %{SOURCE54} external/tarballs/
ln -sf %{SOURCE56} external/tarballs/
ln -sf %{SOURCE60} external/tarballs/
@ -3097,13 +3088,13 @@ rm -rf %{buildroot}/opt
mkdir -p %{buildroot}%{_iconsdir}/hicolor/scalable/apps/
tar -xjvf %{SOURCE10} --exclude Libre_Office* -C %{buildroot}%{_iconsdir}/hicolor/scalable/apps/
sed -i 's/^Icon=.*$/Icon=libreoffice-calc/' %{buildroot}%{ooodir}/share/xdg/calc.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-writer/' %{buildroot}%{ooodir}/share/xdg/writer.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-impress/' %{buildroot}%{ooodir}/share/xdg/impress.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-draw/' %{buildroot}%{ooodir}/share/xdg/draw.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-base/' %{buildroot}%{ooodir}/share/xdg/base.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-math/' %{buildroot}%{ooodir}/share/xdg/math.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-startcenter/' %{buildroot}%{ooodir}/share/xdg/startcenter.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-calc/' %{buildroot}%{ooodir}/share/xdg/calc.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-writer/' %{buildroot}%{ooodir}/share/xdg/writer.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-impress/' %{buildroot}%{ooodir}/share/xdg/impress.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-draw/' %{buildroot}%{ooodir}/share/xdg/draw.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-base/' %{buildroot}%{ooodir}/share/xdg/base.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-math/' %{buildroot}%{ooodir}/share/xdg/math.desktop
sed -i 's/^Icon=.*$/Icon=libreoffice-startcenter/' %{buildroot}%{ooodir}/share/xdg/startcenter.desktop
# fix permissions for stripping
find %{buildroot} -type f -exec chmod u+rw '{}' \;
@ -3111,7 +3102,6 @@ find %{buildroot} -type f -exec chmod u+rw '{}' \;
# fix permission of .so libraries
find %{buildroot} -type f \( -name '*.so' -o -name '*.so.*' \) -exec chmod a+x '{}' \;
# Change progress bar colors
sed -i '/^ProgressBarColor/d;/^ProgressFrameColor/d' \
%{buildroot}%{ooodir}/program/sofficerc
@ -3124,7 +3114,6 @@ sed -i '/^ProgressPosition/d;/^ProgressSize/d' \
echo 'ProgressPosition=10,307' >> %{buildroot}%{ooodir}/program/sofficerc
echo 'ProgressSize=377,9' >> %{buildroot}%{ooodir}/program/sofficerc
# move python bits into site-packages
mkdir -p %{buildroot}/%{py3_platsitedir}
pushd %{buildroot}/%{py3_platsitedir}
@ -3154,7 +3143,7 @@ done;
## sort removing duplicates
sort -u file-lists/gnome_list.txt > file-lists/gnome_list.uniq.sorted.txt
sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt
sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt
# Fix weirdo filenames wreaking havoc because they're regular expressions
sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt