Accepting request 229626 from LibreOffice:Factory

- Version bump to 4.2.3:
  * Bugfix release of 4.3 series
    - Fixing 100 bugs and 20 of those with Major or higher
      importance.

- Fix whitespace.

- Fix autotext symlinking to point right path.

OBS-URL: https://build.opensuse.org/request/show/229626
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=63
This commit is contained in:
Stephan Kulow 2014-04-11 11:38:47 +00:00 committed by Git OBS Bridge
commit 471c095335
9 changed files with 32 additions and 14 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbd0c425ed17e6b55b8a3e764f267bdfd77b09c89e0f534ab1a87f635baabaf9
size 123187640

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfbf3a9025765a73b591438e1a6cc703fc39865bd7ba0933ffebfbffb86dd672
size 123291796

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:386327350015642fd07e27c26c1545cd099119ea33a4bfd78d9b9472c5e659e9
size 1855420

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:559cf226dfc0df7d149445f0938803da144b4fa89be80b96a9a1262d6a5db67c
size 1855268

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b2a28562fba4c2135f201a3bc329708122cf01d8597455780d268c1b50ea19cf
size 127588320

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:850c483cb83d7e376ee443a519285d1079752d1bb6fd313ae5c545bdd638c780
size 127774372

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Apr 10 11:27:52 UTC 2014 - tchvatal@suse.com
- Version bump to 4.2.3:
* Bugfix release of 4.3 series
- Fixing 100 bugs and 20 of those with Major or higher
importance.
-------------------------------------------------------------------
Wed Apr 9 09:52:17 UTC 2014 - tchvatal@suse.com
- Fix whitespace.
-------------------------------------------------------------------
Wed Apr 9 09:44:26 UTC 2014 - tchvatal@suse.com
- Fix autotext symlinking to point right path.
-------------------------------------------------------------------
Fri Mar 28 12:23:02 CET 2014 - fcrozat@suse.com

View File

@ -30,9 +30,9 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.2/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.3/
Name: libreoffice
Version: 4.2.2.1
Version: 4.2.3.3
Release: 0
Summary: A Free Office Suite (Framework)
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@ -1054,7 +1054,7 @@ for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
echo "%{_datadir}/%{name}/help/$file" >> file-lists/common_list.txt
done
# autotext is another self contained dir
mkdir -p %{buildroot}/%{_datadir}/%{name}/autotext/
mkdir -p %{buildroot}/%{_datadir}/%{name}/share/autotext/
grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist
mv tmplist file-lists/common_list.txt
mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/
@ -1129,7 +1129,7 @@ if [ -d "$helpdir" ]; then
fi
if [ -d "$autotextdir" ]; then
rm -rf "$autotextdir" || true
ln -s "%{_datadir}/%{name}/autotext" "$autotextdir"
ln -s "%{_datadir}/%{name}/share/autotext" "$autotextdir"
fi
%post

View File

@ -29,7 +29,7 @@ change_linking() {
linkfile="${file/${datadir}/${libdir}}"
# if the file is already there, skip it
# this is true when the parent folder is link
if [[ ! -e "${linkfile}" ]]; then
if [[ ! -e "${linkfile}" ]]; then
ln -sf "${file}" "${linkfile}" || exit 1
fi
done