backport fix to get presenter screen working

f41
Caolán McNamara 14 years ago
parent 408b8719dc
commit 13eec8cfdd

@ -0,0 +1,25 @@
From 6e673b3b275a5008c654c4bbfb41709d30cd62af Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Wed, 12 Jan 2011 10:03:30 +0100
Subject: [PATCH] fix presenter screens description.xml build
---
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 696d0e5..9e25e34 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -372,7 +372,7 @@ PHONYDESC=.PHONY
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
- $(TYPE) description.tmp | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
+ $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
--
1.7.3.4

@ -28,7 +28,7 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Version: 3.3.0.3
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -99,6 +99,7 @@ Patch12: turn-script-providers-into-extensions.patch
Patch13: libreoffice-installfix.patch
Patch14: 0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
Patch15: libreoffice-bootstrap-kde.patch
Patch16: 0001-fix-presenter-screens-description.xml-build.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -717,6 +718,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch13 -p1 -b .libreoffice-installfix.patch
%patch14 -p1 -b .don-t-bail-out-on-mislength-records.patch
%patch15 -p1 -b .libreoffice-bootstrap-kde.patch
%patch16 -p1 -b .fix-presenter-screens-description.xml-build.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@ -2057,6 +2059,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
* Tue Jan 18 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.3-2
- backport fix to get presenter screen working
* Wed Jan 12 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.3-1
- latest version
- drop integrated 0001-Resoves-rhbz-663857-font-color-missing-C-FAQ-10.3-do.patch

Loading…
Cancel
Save