From 5afd95a1d9a89901eea87db20b22770ff003c6e4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 22 Nov 2014 16:06:57 +0100 Subject: [PATCH] update rhel6 patches --- libreoffice-rhel6gcj.patch | 2 +- libreoffice-rhel6glib.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libreoffice-rhel6gcj.patch b/libreoffice-rhel6gcj.patch index 1874168..75513be 100644 --- a/libreoffice-rhel6gcj.patch +++ b/libreoffice-rhel6gcj.patch @@ -19,7 +19,7 @@ index c5e3e67..8bd18b4 100644 -linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \ $(odk_JAVAPACKAGES) \ - $(if $(JAVADOCISGJDOC),,-notimestamp) \ - > $@ + > $@) # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp diff --git a/libreoffice-rhel6glib.patch b/libreoffice-rhel6glib.patch index 91b3948..39802a3 100644 --- a/libreoffice-rhel6glib.patch +++ b/libreoffice-rhel6glib.patch @@ -45,7 +45,7 @@ index 3461381..eb74104 100644 Library_localebe \ )) --ifeq ($(OS),LINUX) +-ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) -ifeq ($(ENABLE_GIO),TRUE) -$(eval $(call gb_Module_add_targets,shell,\ - Library_losessioninstall \ @@ -53,9 +53,9 @@ index 3461381..eb74104 100644 -endif -endif - - ifeq ($(ENABLE_GCONF),TRUE) + ifeq ($(OS),SOLARIS) + ifeq ($(ENABLE_GIO),TRUE) $(eval $(call gb_Module_add_targets,shell,\ - Library_gconfbe \ -- 1.8.5.3