[libreoffice] new upstream version 3.5.1 rc1

David Tardon dtardon at fedoraproject.org
Mon Feb 27 06:20:00 UTC 2012


commit 27cc96bc96c854f52070c020c220fb48fb2cf645
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Feb 27 07:19:23 2012 +0100

    new upstream version 3.5.1 rc1

 .gitignore       |    4 ++++
 libreoffice.spec |   40 ++++++++++++++++------------------------
 sources          |    8 ++++----
 3 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad8afc9..7ab926d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,7 @@
 /libreoffice-core-3.5.0.3.tar.xz
 /libreoffice-help-3.5.0.3.tar.xz
 /libreoffice-translations-3.5.0.3.tar.xz
+/libreoffice-binfilter-3.5.1.1.tar.xz
+/libreoffice-core-3.5.1.1.tar.xz
+/libreoffice-help-3.5.1.1.tar.xz
+/libreoffice-translations-3.5.1.1.tar.xz
diff --git a/libreoffice.spec b/libreoffice.spec
index 71c3a36..9e37479 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,4 +1,4 @@
-%define libo_version 3.5.0
+%define libo_version 3.5.1
 # rhbz#715152 state vendor
 %if 0%{?rhel}
 %define vendoroption --with-vendor="Red Hat, Inc."
@@ -34,8 +34,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.3
-Release:        6%{?dist}
+Version:        %{libo_version}.1
+Release:        1%{?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
@@ -126,16 +126,9 @@ Patch13: libreoffice-rhel6langs.patch
 Patch14: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
 %endif
 Patch15: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
-Patch16: 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
-Patch17: 0001-make-hsqldb-build-with-java-1.7.patch
-Patch18: libreoffice-ensure-non-broken-xml-tree.patch
-Patch19: 0001-preserve-timestamps-for-.py-files.patch
-Patch20: 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
-Patch21: 0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch
-Patch22: 0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-%if %{with binfilter}
-Patch23: binfilter-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-%endif
+Patch16: 0001-make-hsqldb-build-with-java-1.7.patch
+Patch17: libreoffice-ensure-non-broken-xml-tree.patch
+Patch18: 0001-preserve-timestamps-for-.py-files.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -971,16 +964,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch14 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch
 %endif
 %patch15 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch
-%patch16 -p1 -b .fdo43644-survive-registered-but-unavailabl.patch
-%patch17 -p1 -b .make-hsqldb-build-with-java-1.7.patch
-%patch18 -p1 -b .ensure-non-broken-xml-tree.patch
-%patch19 -p1 -b .preserve-timestamps-for-.py-files.patch
-%patch20 -p1 -b .Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
-%patch21 -p1 -b .fdo45177-avoid-linked-undo-for-the-while.patch
-%patch22 -p1 -b .Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-%if %{with binfilter}
-%patch23 -p1 -b .binfilter-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
-%endif
+%patch16 -p1 -b .make-hsqldb-build-with-java-1.7.patch
+%patch17 -p1 -b .ensure-non-broken-xml-tree.patch
+%patch18 -p1 -b .preserve-timestamps-for-.py-files.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2257,7 +2243,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Thu Feb 16 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.0.3-6.UNBUILT
+* Thu Feb 26 2012 David Tardon <dtardon at redhat.com> - 3.5.1.1-1
+- 3.5.1 rc1
+- drop 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
+- drop 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
+- drop 0001-Fix-fdo-45177-avoid-linked-undo-for-the-while.patch
+- drop 0001-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
+- drop binfilter-Fix-some-apparent-misuses-of-RTL_CONSTASCII_USTRINGP.patch
 - Resolves: fdo#45177 avoid linked undo crash
 - Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM (cherry-picked from
   upstream libreoffice-3-5 branch)
diff --git a/sources b/sources
index a70b975..afe2e2e 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
-6e5066332a2b25b1847d3836f1260e0c  libreoffice-binfilter-3.5.0.3.tar.xz
-209bbbc369b36963d25334c3ef7933e8  libreoffice-core-3.5.0.3.tar.xz
-9df4051a689526888da0467c29186e8c  libreoffice-help-3.5.0.3.tar.xz
-8f7d2774f635f83cebc74e1d4f609d0f  libreoffice-translations-3.5.0.3.tar.xz
+c9865333fa65576385b62225d20f7119  libreoffice-binfilter-3.5.1.1.tar.xz
+b2a9c20eb66f2acd154171e9802cceff  libreoffice-core-3.5.1.1.tar.xz
+f62694899d5f378b6cae234cafff8a92  libreoffice-help-3.5.1.1.tar.xz
+fce6a1c63d7480b9d5106911f9b3d219  libreoffice-translations-3.5.1.1.tar.xz


More information about the scm-commits mailing list