From 6b7a722c2e59adfbcb787b55c6e0b88276835302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 14 Aug 2013 10:47:02 +0100
Subject: [PATCH] tweak for 4-1

---
 libreoffice-rhel6glib.patch | 55 ++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/libreoffice-rhel6glib.patch b/libreoffice-rhel6glib.patch
index 458d861..c335d5e 100644
--- a/libreoffice-rhel6glib.patch
+++ b/libreoffice-rhel6glib.patch
@@ -15,34 +15,27 @@
  ifeq ($(ENABLE_GCONF),TRUE)
  $(eval $(call gb_Module_add_targets,shell,\
  	Library_gconfbe \
---- a/scp2/source/gnome/file_gnome.scp	2013-02-13 16:38:19.475352623 +0000
-+++ b/scp2/source/gnome/file_gnome.scp	2013-02-13 16:38:28.799352829 +0000
-@@ -33,8 +33,6 @@
-     Dir = SCP2_OOO_BIN_DIR;
-     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
- End
--
--SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
- #endif
- 
- #ifdef ENABLE_GNOMEVFS
---- a/scp2/source/gnome/module_gnome.scp	2013-02-13 16:38:19.475352623 +0000
-+++ b/scp2/source/gnome/module_gnome.scp	2013-02-13 16:38:41.308353064 +0000
-@@ -55,7 +55,6 @@
- #endif
- #ifdef ENABLE_GIO
-       gid_File_Lib_GIO,
--      gid_File_Lib_Losessioninstall,
- #endif
- #ifdef ENABLE_GCONF
-       gid_File_Lib_Gconfbe,
---- a/postprocess/packcomponents/makefile.mk	2013-02-15 11:29:08.647352823 +0000
-+++ b/postprocess/packcomponents/makefile.mk	2013-02-15 11:29:13.594376055 +0000
-@@ -246,7 +246,6 @@
- 
- .IF "$(ENABLE_GIO)" != ""
- my_components += \
--    component/shell/source/sessioninstall/losessioninstall \
-     component/ucb/source/ucp/gio/ucpgio
- .END
- 
+diff --git a/Repository.mk b/Repository.mk
+index d0de1d8..526fea3 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -229,7 +229,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+     $(if $(ENABLE_GTK3),vclplug_gtk3) \
+     $(if $(ENABLE_GCONF),gconfbe1) \
+     $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
+-    $(if $(ENABLE_GIO),losessioninstall) \
+     $(if $(ENABLE_GIO),ucpgio1) \
+     $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
+ ))
+diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
+index 936aac2..7d26eb4 100644
+--- a/postprocess/Rdb_services.mk
++++ b/postprocess/Rdb_services.mk
+@@ -197,7 +197,6 @@ $(eval $(call gb_Rdb_add_components,services,\
+ 		shell/source/backends/gconfbe/gconfbe1 \
+ 	) \
+ 	$(if $(ENABLE_GIO), \
+-		shell/source/sessioninstall/losessioninstall \
+ 		ucb/source/ucp/gio/ucpgio \
+ 	) \
+ 	$(if $(ENABLE_GNOMEVFS), \