[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_openoffice

[Caolán McNamara]

 instsetoo_native/CustomTarget_install.mk                       |    6 -
 instsetoo_native/inc_openoffice/unix/find-requires-glib.sh     |   26 -------
 instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh    |   33 ++++++++++
 instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh |   26 -------
 4 files changed, 35 insertions(+), 56 deletions(-)

New commits:
commit 1a038dc88b19ee601f411d5847ee74751b08c476
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 15 17:04:07 2015 +0100

    alternative solution to avoid adding a gnome-vfs dependency if disabled
    
    i.e. "don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled"
    
    seeing as setup_native/source/packinfo/packinfo_office.txt references
    find-requires-gnome.sh and doesn't have conditional support revert the split
    and put the the conditional into find-requires-gnome.sh
    
    Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 101160c..f894ae5 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -21,8 +21,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
 	install.phony \
 	$(if $(filter-out WNT,$(OS)),\
-	$(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
-	bin/find-requires-glib.sh \
+	bin/find-requires-gnome.sh \
 	bin/find-requires-x11.sh) \
 	$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
 ))
@@ -32,8 +31,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
 	$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
 	$(if $(filter-out WNT,$(OS)),\
 		$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
-	        $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
-			bin/find-requires-glib.sh \
+			bin/find-requires-gnome.sh \
 			bin/find-requires-x11.sh) \
 	) \
 	$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
similarity index 84%
rename from instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
rename to instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index 4be8766..bd40ad3 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -19,6 +19,13 @@
 
 cat > /dev/null
 [[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
+if [[ "${ENABLE_GNOMEVFS}" == "TRUE" ]]; then
+  if [[ "${OS}" == "AIX" ]]; then
+    echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
+  else
+    echo "libgnomevfs-2.so.0${mark64}"
+  fi
+fi
 if [[ "${OS}" == "AIX" ]]; then
   echo "libgconf-2.a(libgconf-2.so.4${mark64})"
 else
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
deleted file mode 100644
index 12d03c9..0000000
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-cat > /dev/null
-[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
-if [[ "${OS}" == "AIX" ]]; then
-  echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
-else
-  echo "libgnomevfs-2.so.0${mark64}"
-fi