From 38291e2932a60a16f26649ed015b5c8fc18ac39c8fb6d152d3e8d2750163dc7e Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 15 Sep 2014 20:11:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=18

---
 cmake-policy.patch      | 13 -------------
 full_include_dir.patch  | 13 +++++++++++++
 libdbusmenu-qt5.changes |  2 +-
 libdbusmenu-qt5.spec    |  6 ++++--
 4 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 cmake-policy.patch
 create mode 100644 full_include_dir.patch

diff --git a/cmake-policy.patch b/cmake-policy.patch
deleted file mode 100644
index 5a63b9d..0000000
--- a/cmake-policy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 597a7de..5185d5d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@ project(dbusmenu-qt)
- cmake_minimum_required(VERSION 2.8.11)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
- 
-+cmake_policy(SET CMP0021 OLD)
-+
- # Build options
- option(WITH_DOC "Build documentation (requires Doxygen)" ON)
- 
diff --git a/full_include_dir.patch b/full_include_dir.patch
new file mode 100644
index 0000000..30d2ced
--- /dev/null
+++ b/full_include_dir.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 980e872..abedad7 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -95,7 +95,7 @@ endif()
+ 
+ # Make sure linking to the target adds dbusmenu-qt install directory
+ target_include_directories(dbusmenu-${QT_SUFFIX}
+-    INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
++    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
+ 
+ install(TARGETS dbusmenu-${QT_SUFFIX}
+     EXPORT dbusmenu-${QT_SUFFIX}-targets
diff --git a/libdbusmenu-qt5.changes b/libdbusmenu-qt5.changes
index da7716c..2ffb99e 100644
--- a/libdbusmenu-qt5.changes
+++ b/libdbusmenu-qt5.changes
@@ -7,7 +7,7 @@ Mon Sep 15 19:31:29 UTC 2014 - hrvoje.senjan@gmail.com
     Simply adding dbusmenu-qt5 to the target_link_libraries()
     call takes care of defining the include directory.
 - Rebase noqDebug-qWarnings.patch
-- Added cmake-policy.patch for openSUSE 13.1
+- Added full_include_dir.patch for openSUSE 13.1
 
 -------------------------------------------------------------------
 Mon Jun  2 21:37:10 UTC 2014 - hrvoje.senjan@gmail.com
diff --git a/libdbusmenu-qt5.spec b/libdbusmenu-qt5.spec
index 268a1a4..0cb52d1 100644
--- a/libdbusmenu-qt5.spec
+++ b/libdbusmenu-qt5.spec
@@ -30,8 +30,8 @@ Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM noqDebug-qWarnings.patch -- libdbusmenu uses it's own qDebug's and qWarnings,
 # which are useless, and annoy users, so this patch just disables them in release mode
 Patch1:         noqDebug-qWarnings.patch
-# PATCH-FIX-UPSTREAM cmake-policy.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy
-Patch2:         cmake-policy.patch
+# PATCH-FIX-UPSTREAM full_include_dir.patch -- CMake 2.8.12 creates a fatal error on relative include dirs for a target. silence that policy
+Patch2:         full_include_dir.patch
 #Needed for DISABLE_FIND_PACKAGE
 BuildRequires:  cmake >= 2.8.6
 BuildRequires:  doxygen
@@ -71,7 +71,9 @@ This package contains development files for libdbusmenu-qt5.
 %prep
 %setup -q -n %{rname}-%{version}
 %patch1 -p1
+%if 0%{?suse_version} <= 1310
 %patch2 -p1
+%endif
 
 # Remove build time references so build-compare can do its work
 sed -i "s/HTML_TIMESTAMP         = YES/HTML_TIMESTAMP         = NO/" Doxyfile.in