[libreoffice/f15] Resolves: rhbz#725144 wrong csh syntax

[Caolan McNamara]

commit 34aeffff3f0415bb78916c0f31f0a559e79e1365
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 25 11:08:23 2011 +0100

    Resolves: rhbz#725144 wrong csh syntax

 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch |   35 ++++++++++++++++++++++
 libreoffice.spec                                 |    7 ++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-725144-wrong-csh-syntax.patch b/0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
new file mode 100644
index 0000000..1e206fb
--- /dev/null
+++ b/0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
@@ -0,0 +1,35 @@
+From 1f1bba573a0bc1e27264c870b7822a8d183f80f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 25 Jul 2011 11:03:31 +0100
+Subject: [PATCH] Resolves: rhbz#725144 wrong csh syntax
+
+---
+ odk/setsdkenv_unix.csh.in |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
+index cb2b0f5..f48be7b 100644
+--- a/odk/setsdkenv_unix.csh.in
++++ b/odk/setsdkenv_unix.csh.in
+@@ -13,8 +13,7 @@ setenv OO_SDK_HOME '@OO_SDK_HOME@'
+ 
+ # Office installation directory.
+ # Example: set OFFICE_HOME=/opt/libreoffice
+-set OFFICE_HOME='@OFFICE_HOME@'
+-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
++setenv OFFICE_HOME '@OFFICE_HOME@'
+ 
+ # URE installation directory.
+ # Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure
+@@ -227,7 +226,7 @@ if ( $?OO_SDK_JAVA_HOME == 0) then
+ endif
+ 
+ 
+-if [ "${platform}" == "MacOSX" ] then
++if ( "${platform}" == "MacOSX" ) then
+ #    For URE, prepare symbolic links for libraries:
+ #    Only necessary on MacOSX, on other Unix systems the links are already prepared
+ #    in the SDK installation.
+-- 
+1.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index a254c89..147be35 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -29,7 +29,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.3.3.1
-Release:        3%{?dist}
+Release:        4%{?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
@@ -153,6 +153,7 @@ Patch64: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
 Patch65: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 Patch66: 0001-fix-regression-in-SvGlobalName-operator.patch
 Patch67: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
+Patch68: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -821,6 +822,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch65 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 %patch66 -p1 -b .fix-regression-in-SvGlobalName-operator.patch
 %patch67 -p1 -b .rhbz715549-use-fontconfig-s-detected-forma.patch
+%patch68 -p1 -b .rhbz725144-wrong-csh-syntax.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2165,6 +2167,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Mon Jul 25 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-4-UNBUILT
+- Resolves: rhbz#725144 wrong csh syntax
+
 * Tue Jul 19 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-3
 - fix regression in SvGlobalName operator
 - Resolves: rhbz#715549 use fontconfig's detected format