From b47a93160d97ac30bf521d29166911751ca249083a17fcdbdf217f1dba612ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 9 Apr 2014 09:44:48 +0000 Subject: [PATCH 1/4] - Fix autotext symlinking to point right path. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=129 --- libreoffice.changes | 5 +++++ libreoffice.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index cb532f6..6c135be 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index d120abb..703d81e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 From 989adac78d81376b0c74d93e825ec62fc98f570b2653a07c602978f02d1e4a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 9 Apr 2014 09:52:31 +0000 Subject: [PATCH 2/4] - Fix whitespace. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=130 --- libreoffice.changes | 5 +++++ link-to-ooo-home | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 6c135be..05c0f77 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 9 09:52:17 UTC 2014 - tchvatal@suse.com + +- Fix whitespace. + ------------------------------------------------------------------- Wed Apr 9 09:44:26 UTC 2014 - tchvatal@suse.com diff --git a/link-to-ooo-home b/link-to-ooo-home index e0281e1..298666d 100644 --- a/link-to-ooo-home +++ b/link-to-ooo-home @@ -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 From 8d67ece56ba31df92ef40fd1aeda5f113b7a107eda378e24be541a28dd454422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Apr 2014 11:30:15 +0000 Subject: [PATCH 3/4] - Version bump to 4.2.3: * Bugfix release of 4.3 series - Fixing 100 bugs and 20 of those with Major or higher importance. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=131 --- libreoffice-4.2.2.1.tar.xz | 3 --- libreoffice-4.2.3.3.tar.xz | 3 +++ libreoffice-help-4.2.2.1.tar.xz | 3 --- libreoffice-help-4.2.3.3.tar.xz | 3 +++ libreoffice-translations-4.2.2.1.tar.xz | 3 --- libreoffice-translations-4.2.3.3.tar.xz | 3 +++ libreoffice.changes | 8 ++++++++ libreoffice.spec | 4 ++-- 8 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 libreoffice-4.2.2.1.tar.xz create mode 100644 libreoffice-4.2.3.3.tar.xz delete mode 100644 libreoffice-help-4.2.2.1.tar.xz create mode 100644 libreoffice-help-4.2.3.3.tar.xz delete mode 100644 libreoffice-translations-4.2.2.1.tar.xz create mode 100644 libreoffice-translations-4.2.3.3.tar.xz diff --git a/libreoffice-4.2.2.1.tar.xz b/libreoffice-4.2.2.1.tar.xz deleted file mode 100644 index 970807f..0000000 --- a/libreoffice-4.2.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbd0c425ed17e6b55b8a3e764f267bdfd77b09c89e0f534ab1a87f635baabaf9 -size 123187640 diff --git a/libreoffice-4.2.3.3.tar.xz b/libreoffice-4.2.3.3.tar.xz new file mode 100644 index 0000000..346f832 --- /dev/null +++ b/libreoffice-4.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8758d99b948a8a24dcb1d1d91bba448adda8f25a122909212f59c1c875043433 +size 123302548 diff --git a/libreoffice-help-4.2.2.1.tar.xz b/libreoffice-help-4.2.2.1.tar.xz deleted file mode 100644 index 089a54f..0000000 --- a/libreoffice-help-4.2.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:386327350015642fd07e27c26c1545cd099119ea33a4bfd78d9b9472c5e659e9 -size 1855420 diff --git a/libreoffice-help-4.2.3.3.tar.xz b/libreoffice-help-4.2.3.3.tar.xz new file mode 100644 index 0000000..8c1396f --- /dev/null +++ b/libreoffice-help-4.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c3878a09b308eb69492caf83355fe62ad92515d202a95325f0b94e3570dad8 +size 1854932 diff --git a/libreoffice-translations-4.2.2.1.tar.xz b/libreoffice-translations-4.2.2.1.tar.xz deleted file mode 100644 index d0fa753..0000000 --- a/libreoffice-translations-4.2.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a28562fba4c2135f201a3bc329708122cf01d8597455780d268c1b50ea19cf -size 127588320 diff --git a/libreoffice-translations-4.2.3.3.tar.xz b/libreoffice-translations-4.2.3.3.tar.xz new file mode 100644 index 0000000..f28c7cc --- /dev/null +++ b/libreoffice-translations-4.2.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f43dc3a51b4a70a0e073750023e8c6f46987e4cfc5c86f6b8780fbde30dced29 +size 127771840 diff --git a/libreoffice.changes b/libreoffice.changes index 05c0f77..773fc7e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 703d81e..80503f6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 From 49cc7d8147afa18d0765ab7ff54080e4767cc03593f93925b4915b4db05b87f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Apr 2014 13:12:42 +0000 Subject: [PATCH 4/4] Updated tarballs... OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=132 --- libreoffice-4.2.3.3.tar.xz | 4 ++-- libreoffice-help-4.2.3.3.tar.xz | 4 ++-- libreoffice-translations-4.2.3.3.tar.xz | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libreoffice-4.2.3.3.tar.xz b/libreoffice-4.2.3.3.tar.xz index 346f832..0ed47de 100644 --- a/libreoffice-4.2.3.3.tar.xz +++ b/libreoffice-4.2.3.3.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8758d99b948a8a24dcb1d1d91bba448adda8f25a122909212f59c1c875043433 -size 123302548 +oid sha256:dfbf3a9025765a73b591438e1a6cc703fc39865bd7ba0933ffebfbffb86dd672 +size 123291796 diff --git a/libreoffice-help-4.2.3.3.tar.xz b/libreoffice-help-4.2.3.3.tar.xz index 8c1396f..d51df4c 100644 --- a/libreoffice-help-4.2.3.3.tar.xz +++ b/libreoffice-help-4.2.3.3.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c3878a09b308eb69492caf83355fe62ad92515d202a95325f0b94e3570dad8 -size 1854932 +oid sha256:559cf226dfc0df7d149445f0938803da144b4fa89be80b96a9a1262d6a5db67c +size 1855268 diff --git a/libreoffice-translations-4.2.3.3.tar.xz b/libreoffice-translations-4.2.3.3.tar.xz index f28c7cc..4e98c5d 100644 --- a/libreoffice-translations-4.2.3.3.tar.xz +++ b/libreoffice-translations-4.2.3.3.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f43dc3a51b4a70a0e073750023e8c6f46987e4cfc5c86f6b8780fbde30dced29 -size 127771840 +oid sha256:850c483cb83d7e376ee443a519285d1079752d1bb6fd313ae5c545bdd638c780 +size 127774372