From 11a530a46c526471253535eb2c827f9894a0c6475260100a92d15324ab6bb85d Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.com>
Date: Fri, 19 Apr 2013 12:50:40 +0000
Subject: [PATCH] Accepting request 172472 from LibreOffice:Unstable

- buildfix-sfx2-dependency.diff: svx headers started to be used in sfx2

* solenv-touch-no-dereference.diff: touch --no-dereference in not
  available on SLED11-SP1 and it is not needed when not using hardlinks

OBS-URL: https://build.opensuse.org/request/show/172472
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=31
---
 buildfix-sfx2-dependency.diff    | 10 ++++++++++
 libreoffice.changes              | 11 +++++++++++
 libreoffice.spec                 | 10 ++++++++++
 solenv-touch-no-dereference.diff | 11 +++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 buildfix-sfx2-dependency.diff
 create mode 100644 solenv-touch-no-dereference.diff

diff --git a/buildfix-sfx2-dependency.diff b/buildfix-sfx2-dependency.diff
new file mode 100644
index 0000000..fdb7754
--- /dev/null
+++ b/buildfix-sfx2-dependency.diff
@@ -0,0 +1,10 @@
+--- sfx2/Library_sfx.mk.old	2013-04-16 18:14:55.000000000 +0200
++++ sfx2/Library_sfx.mk	2013-04-19 13:25:37.000000000 +0200
+@@ -22,6 +22,7 @@ $(eval $(call gb_Library_Library,sfx))
+ $(eval $(call gb_Library_use_packages,sfx,\
+     sfx2_inc \
+     sfx2_sdi \
++    svx_inc \
+ ))
+ 
+ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
diff --git a/libreoffice.changes b/libreoffice.changes
index 01440e4..7c6af1c 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 19 11:32:28 UTC 2013 - pmladek@suse.com
+
+- buildfix-sfx2-dependency.diff: svx headers started to be used in sfx2
+
+-------------------------------------------------------------------
+Thu Apr 18 10:31:42 UTC 2013 - pmladek@suse.com
+
+* solenv-touch-no-dereference.diff: touch --no-dereference in not
+  available on SLED11-SP1 and it is not needed when not using hardlinks
+
 -------------------------------------------------------------------
 Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 7f2a544..f469e8e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -588,6 +588,8 @@ Patch6:         pack-desktop-files-for-optional-filters.diff
 # put internal rhino into XBootClasspath to fix build with OpenJDK
 # FIXME: make it clean to be able to push upstream
 Patch7:         scripting-prefer-internal-rhino.diff
+# svx headers started to be used in sfx2
+Patch8:         buildfix-sfx2-dependency.diff
 # search <lo-home>/share/template/common for language independent templates
 # FIXME: make it configurable to push upstream
 Patch9:         office-cfg-linux-common-template-dir.diff
@@ -617,6 +619,9 @@ Patch910:       libreoffice-poppler-0.17.0-reject-fix.diff
 Patch920:       redland-rpath-hack.diff
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
+# FIXME: touch --no-dereference in not available on SLED11-SP1
+#        and it is not needed when not using harlinks
+Patch991:       solenv-touch-no-dereference.diff
 #
 # Patches against zip-3.0
 Patch2000:      zip-3.0-iso8859_2.patch
@@ -1289,6 +1294,7 @@ the LibreOffice localizations separately.
 %patch5
 %patch6 -p1
 %patch7 -p1
+%patch8
 %patch9
 %patch10 -p1
 %patch11
@@ -1311,6 +1317,10 @@ the LibreOffice localizations separately.
 %if %save_space == 1
 # use hardlinks when installing files
 %patch990
+%else
+# FIXME: touch --no-dereference in not available on SLED11-SP1
+#        and it is not needed when not using harlinks
+%patch991
 %endif
 # 256x256 icons
 tar -xjf %{S:20}
diff --git a/solenv-touch-no-dereference.diff b/solenv-touch-no-dereference.diff
new file mode 100644
index 0000000..d948380
--- /dev/null
+++ b/solenv-touch-no-dereference.diff
@@ -0,0 +1,11 @@
+--- solenv/gbuild/Deliver.mk.old	2013-03-28 19:01:42.000000000 +0100
++++ solenv/gbuild/Deliver.mk	2013-04-18 12:24:05.000000000 +0200
+@@ -60,7 +60,7 @@ endif
+ endef
+ 
+ define gb_Deliver__deliver
+-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
++$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
+ endef
+ 
+ ifneq ($(strip $(gb_Deliver_GNUCOPY)),)