f41
David Tardon 13 years ago
parent 0cbc38a4a3
commit ee5a075a63

4
.gitignore vendored

@ -89,3 +89,7 @@
/libreoffice-core-3.5.3.2.tar.xz /libreoffice-core-3.5.3.2.tar.xz
/libreoffice-help-3.5.3.2.tar.xz /libreoffice-help-3.5.3.2.tar.xz
/libreoffice-translations-3.5.3.2.tar.xz /libreoffice-translations-3.5.3.2.tar.xz
/libreoffice-binfilter-3.5.4.1.tar.xz
/libreoffice-core-3.5.4.1.tar.xz
/libreoffice-help-3.5.4.1.tar.xz
/libreoffice-translations-3.5.4.1.tar.xz

@ -1,4 +1,4 @@
%define libo_version 3.5.3 %define libo_version 3.5.4
# rhbz#715152 state vendor # rhbz#715152 state vendor
%if 0%{?rhel} %if 0%{?rhel}
%define vendoroption --with-vendor="Red Hat, Inc." %define vendoroption --with-vendor="Red Hat, Inc."
@ -34,8 +34,8 @@
Summary: Free Software Productivity Suite Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.1
Release: 5%{?dist} 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 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 Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -145,11 +145,7 @@ Patch31: 0001-save-register-arguments-first.patch
Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
Patch34: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch Patch34: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
Patch35: 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch Patch35: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
Patch36: 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
Patch37: 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
Patch38: 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
Patch39: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -1011,12 +1007,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch %patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
%patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch %patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch
%patch34 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch %patch34 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch
%patch35 -p1 -b .do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch
%patch36 -p1 -b .rhbz-809019-count-mirrored-monitors-as-one.patch
%patch37 -p1 -b .incrementing-index-twice-in-one-run-seems-wrong.patch
%patch38 -p1 -b .rhbz-809019-count-mirrored-monitors-as-one.patch
%if %{defined rhel} && 0%{?rhel} >= 7 || %{defined fedora} && 0%{?fedora} >= 18 %if %{defined rhel} && 0%{?rhel} >= 7 || %{defined fedora} && 0%{?fedora} >= 18
%patch39 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch %patch35 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch
%endif %endif
# TODO: check this # TODO: check this
@ -2305,6 +2297,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Wed May 16 2012 David Tardon <dtardon@redhat.com> - 3.5.4.1-1
- 3.5.4 rc1
- drop integrated 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch
- drop integrated 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
- drop integrated 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
- drop integrated 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
* Sun May 13 2012 Caolán McNamara <caolanm@redhat.com> - 3.5.3.2-5 * Sun May 13 2012 Caolán McNamara <caolanm@redhat.com> - 3.5.3.2-5
- Resolves: fdo#49849 line breaking fixes for Hebrew - Resolves: fdo#49849 line breaking fixes for Hebrew

@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
d8c5da3f1f298d2ac35444f9dc4ce8f2 libreoffice-binfilter-3.5.3.2.tar.xz caf0b59daf3b2d3ce96812aa16d475c0 libreoffice-binfilter-3.5.4.1.tar.xz
d22cd79e7463ac4caf0a4b47d78a82ac libreoffice-core-3.5.3.2.tar.xz 95b403f5c1e2efbf3e3c51f6570e3453 libreoffice-core-3.5.4.1.tar.xz
3455f3f523d739aa391b5a5bf04ff958 libreoffice-help-3.5.3.2.tar.xz a73a0c4762db17706ae0668a97c7f489 libreoffice-help-3.5.4.1.tar.xz
945fbf7888c464f4e1cf7282d370b257 libreoffice-translations-3.5.3.2.tar.xz 44856f1a409f3edc7f8a44b358c97f07 libreoffice-translations-3.5.4.1.tar.xz

Loading…
Cancel
Save