[libreoffice/f18] Resolves: rhbz#907112 presentation mode does not inhibit screen saver

[Caolán McNamara]

commit 9b1f1a81bdd0a5034e48044ae2747776286a5899
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 5 21:28:45 2013 +0000

    Resolves: rhbz#907112 presentation mode does not inhibit screen saver

 ...these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch |   35 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch b/0001-these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
new file mode 100644
index 0000000..a5709c1
--- /dev/null
+++ b/0001-these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
@@ -0,0 +1,35 @@
+From 9ec0a3ec629a05809852728482fdb3f3d997edef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 30 Aug 2012 13:44:53 +0100
+Subject: [PATCH] these ENABLE_FOOs are set to TRUE not YES
+
+Change-Id: I821a41752643fe78cc99ea20e5d7ef11e7a5e91a
+---
+ RepositoryExternal.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index cf41f69..96709fb 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -1157,7 +1157,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
+ endef
+ 
+ 
+-ifeq ($(ENABLE_DBUS),YES)
++ifeq ($(ENABLE_DBUS),TRUE)
+ 
+ define gb_LinkTarget__use_dbus
+ $(call gb_LinkTarget_set_include,$(1),\
+@@ -1727,7 +1727,7 @@ endef
+ endif # ENABLE_KDE4
+ 
+ 
+-ifeq ($(ENABLE_TDE),YES)
++ifeq ($(ENABLE_TDE),TRUE)
+ 
+ define gb_LinkTarget__use_tde
+ $(call gb_LinkTarget_add_libs,$(1),\
+-- 
+1.8.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 16a90fd..63018bd 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -44,7 +44,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?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 and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -251,6 +251,7 @@ Patch30: libreoffice-rhel6poppler.patch
 Patch31: libreoffice-rhel6langs.patch
 Patch32: 0001-rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch
 %endif
+Patch33: 0001-these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -995,6 +996,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch31 -p1 -b .rhel6langs.patch
 %patch32 -p1 -b .rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch
 %endif
+%patch33 -p1 -b .these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2263,6 +2265,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Feb 05 2013 Caolán McNamara <caolanm at redhat.com> - 1:3.6.5.2-2
+- Resolves: rhbz#907112 presentation mode does not inhibit screen saver
+
 * Fri Jan 25 2013 David Tardon <dtardon at redhat.com> - 1:3.6.5.2-1
 - 3.6.5 rc2