From 4f862f4d009ad745896cb2f2207388c6b086190c Mon Sep 17 00:00:00 2001 From: akdengi Date: Sun, 12 May 2013 11:30:46 +0400 Subject: [PATCH] 4.0.3.3 --- .abf.yml | 12 ++++++++---- libreoffice.spec | 19 ++++--------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.abf.yml b/.abf.yml index 43a6cfe..0879952 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,12 +1,16 @@ removed_sources: libreoffice-4.0.0.3.tar.xz: d74f7987edd9784c927def3c7f7d43f6a0a72d5c libreoffice-4.0.1.1.tar.xz: 6d9c0deee44c57abb90aa8e40ab4c2678f25d045 + libreoffice-4.0.2.2.tar.xz: bb8dbcb7c678bf048c9b241b9493b3f23aa8d1fc libreoffice-dictionaries-4.0.0.3.tar.xz: c30b3d0351fdee006c9abb6f58db6b0c67de2b1e libreoffice-dictionaries-4.0.1.1.tar.xz: 1bc0479ca646393d6b2df1aa6327a93854bd9816 + libreoffice-dictionaries-4.0.2.2.tar.xz: b31258e2f0ebbe2fe96e87b7e7d9ede43be8de31 libreoffice-help-4.0.0.3.tar.xz: f71be664dbe78f49883a7871477b670e076a5f64 libreoffice-help-4.0.1.1.tar.xz: 7cea7f694c47f24b60dbaec50fe46fdc177f19d7 + libreoffice-help-4.0.2.2.tar.xz: 7d4b9527e0194a496d237a1b734f0f4dbb9947fd libreoffice-translations-4.0.0.3.tar.xz: 35b052f6424c4704d65ed1de6a514e9dc6207982 libreoffice-translations-4.0.1.1.tar.xz: 3356ac8cd1fdbafeec05c575f5d7dc782c07faa6 + libreoffice-translations-4.0.2.2.tar.xz: 50b49d9c3141bf65702f4f47b9604a1eddb5944b sources: 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz: 452eba922e4f41603539c9dc39947d2271e47093 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec @@ -53,9 +57,9 @@ sources: libcdr-0.0.9.tar.bz2: a572db87b72d63d0d33f5c55ed564e0f003273b5 libixion_0.3.0.tar.bz2: ac1fa915303ed8492ac50d6f0aa4d974e8405954 libmspub-0.0.3.tar.bz2: 19857721aa39d1a64d3b5f519ff89f63346654bb - libreoffice-4.0.2.2.tar.xz: bb8dbcb7c678bf048c9b241b9493b3f23aa8d1fc - libreoffice-dictionaries-4.0.2.2.tar.xz: b31258e2f0ebbe2fe96e87b7e7d9ede43be8de31 - libreoffice-help-4.0.2.2.tar.xz: 7d4b9527e0194a496d237a1b734f0f4dbb9947fd - libreoffice-translations-4.0.2.2.tar.xz: 50b49d9c3141bf65702f4f47b9604a1eddb5944b + libreoffice-4.0.3.3.tar.xz: 97041d60009135d028b6bc062e6f441606c692bf + libreoffice-dictionaries-4.0.3.3.tar.xz: 336cb0ddc317dec2e37c2daf97e08a1020cd2ccd + libreoffice-help-4.0.3.3.tar.xz: 8135b32b47bc0577d95eb5ec03483f63459e701c + libreoffice-translations-4.0.3.3.tar.xz: c81a03210abc634f428c73cc5f50bf4c12b38913 libvisio-0.0.24.tar.bz2: 49ca23b3d41697d0652ca8e3d3dc5d9900217608 ooo_oxygen_images-2009-06-17.tar.gz: c3dd261bfe366ac514a019b0fa829369b833c0c7 diff --git a/libreoffice.spec b/libreoffice.spec index 2a68d37..3b44e4a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -21,16 +21,9 @@ %define _binary_payload w1.xzdio %define _source_payload w1.xzdio -%if %mandriva_branch == Cooker -# Cooker -%define release 3 -%else -# Old distros -%define subrel 1 -%define release 2 -%endif +%define release 1 -%define buildver %version.2 +%define buildver %version.3 %define ooodir %{_libdir}/libreoffice %if %l10n %define langs "en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru sh si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu" @@ -93,8 +86,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 4.0.2 -Release: 3 +Version: 4.0.3 +Release: 1 URL: http://www.libreoffice.org 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 @@ -147,10 +140,6 @@ BuildRequires: gnutls-devel BuildRequires: gperf BuildRequires: imagemagick %if %{use_systemdb} -%if %mdkversion < 201020 -# this is pulled by db-devel >= 4.8, and libdbcxx?.? does not provide libdbcxx at all -BuildRequires: libdbcxx >= 4.2.5-4mdk -%endif BuildRequires: db-devel >= 4.2.5-4mdk %else BuildConflicts: libdbjava4.2