[libreoffice] 3.6.0.0 beta3
David Tardon
dtardon at fedoraproject.org
Thu Jul 5 13:57:17 UTC 2012
commit f97cc27be3add295d5d5c73f9709dc25cd2f4be8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Jul 5 15:03:22 2012 +0200
3.6.0.0 beta3
.gitignore | 4 +
0001-disable-failing-check.patch | 25 ------
0001-fix-invalid-.desktop-files.patch | 113 --------------------------
0001-remove-useless-extern-declaration.patch | 29 -------
libreoffice.spec | 13 +--
sources | 8 +-
6 files changed, 13 insertions(+), 179 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b6c14d..97d55bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,7 @@
/libreoffice-core-3.6.0.0.beta2.tar.xz
/libreoffice-help-3.6.0.0.beta2.tar.xz
/libreoffice-translations-3.6.0.0.beta2.tar.xz
+/libreoffice-binfilter-3.6.0.0.beta3.tar.xz
+/libreoffice-core-3.6.0.0.beta3.tar.xz
+/libreoffice-help-3.6.0.0.beta3.tar.xz
+/libreoffice-translations-3.6.0.0.beta3.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 9fb868c..7747e1e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -3,7 +3,7 @@
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
-%define libo_prerelease .beta2
+%define libo_prerelease .beta3
%define vendoroption --with-vendor="The Fedora Project"
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -30,7 +30,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
-Release: 2%{libo_prerelease}%{?dist}
+Release: 3%{libo_prerelease}%{?dist}
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: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -161,9 +161,6 @@ Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
Patch7: libreoffice-installfix.patch
Patch8: 0001-specify-the-sourced-file-with-path.patch
-Patch9: 0001-disable-failing-check.patch
-Patch10: 0001-remove-useless-extern-declaration.patch
-Patch11: 0001-fix-invalid-.desktop-files.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -769,9 +766,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch
%patch7 -p1 -b .libreoffice-installfix.patch
%patch8 -p1 -b .specify-the-sourced-file-with-path.patch
-%patch9 -p1 -b .disable-failing-check.patch
-%patch10 -p1 -b .remove-useless-extern-declaration.patch
-%patch11 -p1 -b .fix-invalid-.desktop-files.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -2004,6 +1998,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Jul 05 2012 David Tardon <dtardon at redhat.com> - 3.6.0.0-3
+- 3.6.0 beta3
+
* Mon Jul 2 2012 Marek Kasik <mkasik at redhat.com> - 3.6.0.0-2
- Rebuild (poppler-0.20.1)
diff --git a/sources b/sources
index b72f313..e0745c7 100644
--- a/sources
+++ b/sources
@@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-ad4a879b362c89b03393923b729d1eeb libreoffice-binfilter-3.6.0.0.beta2.tar.xz
-97183afb02576d5542a1eda3f29f9517 libreoffice-core-3.6.0.0.beta2.tar.xz
-3368bc1adfa9e7d6d6f3ce2cee9e164e libreoffice-help-3.6.0.0.beta2.tar.xz
-7191e46a3f48ad7a7d5a21e985790e6a libreoffice-translations-3.6.0.0.beta2.tar.xz
+7ba28cb767376cf368217e47c0770dff libreoffice-binfilter-3.6.0.0.beta3.tar.xz
+02919e9b5af22d26adb98fd63d504430 libreoffice-core-3.6.0.0.beta3.tar.xz
+85506c2838798d01f130dca3bb2ec3e3 libreoffice-help-3.6.0.0.beta3.tar.xz
+e6539c2417e454048e3367e6e48196e9 libreoffice-translations-3.6.0.0.beta3.tar.xz
More information about the scm-commits
mailing list