diff --git a/0001-use-ure-instead-of-ure-link.patch b/0001-use-ure-instead-of-ure-link.patch new file mode 100644 index 0000000..8552406 --- /dev/null +++ b/0001-use-ure-instead-of-ure-link.patch @@ -0,0 +1,28 @@ +From 0acbbeaeeb8ef0221dbef6d6bbdea94394d79a59 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 11 Jun 2012 14:09:39 +0200 +Subject: [PATCH] use ure instead of ure-link + +Change-Id: I5368770926aee871e20b2d87fa51b28212c8be4f +--- + solenv/bin/install-gdb-printers | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers +index c478929..51ab9e2 100755 +--- a/solenv/bin/install-gdb-printers ++++ b/solenv/bin/install-gdb-printers +@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then + cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" + fi + +-make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 +-make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 ++make_autoload cppu ure/lib libuno_cppu."$DYLIB".3 ++make_autoload sal ure/lib libuno_sal."$DYLIB".3 + make_autoload svl program libsvllo."$DYLIB" + make_autoload sw program libswlo."$DYLIB" + make_autoload tl program libtllo."$DYLIB" +-- +1.7.10.2 + diff --git a/libreoffice.spec b/libreoffice.spec index c96f361..cef4587 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -149,6 +149,7 @@ Patch35: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch Patch36: 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch Patch37: 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch Patch38: 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch +Patch39: 0001-use-ure-instead-of-ure-link.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -1016,6 +1017,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch36 -p1 -b .gcc-trunk-fix-unable-to-find-string-literal-operator.patch %patch37 -p1 -b .ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch %patch38 -p1 -b .rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch +%patch39 -p1 -b .use-ure-instead-of-ure-link.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2298,6 +2300,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jun 11 2012 David Tardon - 3.5.4.2-3 +- make gdb pretty printers for URE libs usable again + * Fri Jun 08 2012 Caolán McNamara - 3.5.4.2-2 - Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x]