diff --git a/0001-preserve-timestamps-for-.py-files.patch b/0001-preserve-timestamps-for-.py-files.patch new file mode 100644 index 0000000..88aefa5 --- /dev/null +++ b/0001-preserve-timestamps-for-.py-files.patch @@ -0,0 +1,28 @@ +From 18af7e03d81d295a47457486d3036681bd17eb81 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 13 Feb 2012 10:45:59 +0000 +Subject: [PATCH] preserve timestamps for .py files + +.pyc and .pyo binary caches contain the timestamp of the .py file, so for +fedora multilib if the .py files get different times on different arch then the +.py[o|c] files end up being different for the same content +--- + solenv/bin/install-gdb-printers | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers +index 99686cf..df327a0 100755 +--- a/solenv/bin/install-gdb-printers ++++ b/solenv/bin/install-gdb-printers +@@ -165,7 +165,7 @@ fi + + if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then + mkdir -p "${DESTDIR}${pythondir}" || die "cannot create dir '${DESTDIR}${pythondir}'" +- cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" ++ cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" + fi + + make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 611f672..9dac6aa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -34,7 +34,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.5.0.3 -Release: 3%{?dist} +Release: 4%{?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 @@ -124,6 +124,7 @@ Patch14: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch Patch15: 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch 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} @@ -833,6 +834,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch15 -p1 -b .fdo43644-survive-registered-but-unavailabl.patch %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 @@ -2130,6 +2132,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Feb 13 2012 Caolán McNamara - 3.5.0.3-4 +- ensure gdb .py files have the same timstamps so that multilib + .pyc's and .pyo's have the same content (timestamp in binary cache) + * Sat Feb 11 2012 Caolán McNamara - 3.5.0.3-3 - make sure .tree files don't get busted again