|
|
|
@ -1,4 +1,4 @@
|
|
|
|
%define libo_version 3.5.1
|
|
|
|
%define libo_version 3.5.2
|
|
|
|
# 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: 2%{?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
|
|
|
|
@ -138,7 +138,6 @@ Patch21: 0001-Related-rhbz-799628-crash-with-chewing-IM-with-g3g.patch
|
|
|
|
Patch22: 0001-silence-SolarMutex-not-locked-spew.patch
|
|
|
|
Patch22: 0001-silence-SolarMutex-not-locked-spew.patch
|
|
|
|
Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
|
|
|
|
Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
|
|
|
|
Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
|
|
|
|
Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
|
|
|
|
Patch25: 0001-yet-another-clash-with-macro-name.patch
|
|
|
|
|
|
|
|
Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
|
|
|
|
Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.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))")}
|
|
|
|
@ -986,7 +985,6 @@ mv -f redhat.soc extras/source/palettes/standard.soc
|
|
|
|
%patch22 -p1 -b .silence-SolarMutex-not-locked-spew.patch
|
|
|
|
%patch22 -p1 -b .silence-SolarMutex-not-locked-spew.patch
|
|
|
|
%patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
|
|
|
|
%patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
|
|
|
|
%patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
|
|
|
|
%patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
|
|
|
|
%patch25 -p1 -b .yet-another-clash-with-macro-name.patch
|
|
|
|
|
|
|
|
%patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
|
|
|
|
%patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
|
|
|
|
|
|
|
|
|
|
|
|
# TODO: check this
|
|
|
|
# TODO: check this
|
|
|
|
@ -2275,6 +2273,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Sun Mar 25 2012 David Tardon <dtardon@redhat.com> - 3.5.2.1-1
|
|
|
|
|
|
|
|
- 3.5.2 rc1
|
|
|
|
|
|
|
|
-drop integrated 0001-yet-another-clash-with-macro-name.patch
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Mar 14 2012 David Tardon <dtardon@redhat.com> - 3.5.1.2-2
|
|
|
|
* Wed Mar 14 2012 David Tardon <dtardon@redhat.com> - 3.5.1.2-2
|
|
|
|
- Resolves: rhbz#770209 can't change paper tray setting while printing
|
|
|
|
- Resolves: rhbz#770209 can't change paper tray setting while printing
|
|
|
|
|
|
|
|
|
|
|
|
|
David Tardon
13 years ago