From 86f5afbfe485bb5eb78a4b82a74236d7049bfe633acdda59a54b6420dc574ada Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 12 Oct 2015 08:01:19 +0000 Subject: [PATCH] Accepting request 337919 from KDE:Extra - Added building-docs-once-is-enough.patch: Fix build when CMP002 policy is set to NEW OBS-URL: https://build.opensuse.org/request/show/337919 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=60 --- building-docs-once-is-enough.patch | 9 +++++++++ k3b.changes | 6 ++++++ k3b.spec | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 building-docs-once-is-enough.patch diff --git a/building-docs-once-is-enough.patch b/building-docs-once-is-enough.patch new file mode 100644 index 0000000..d886eea --- /dev/null +++ b/building-docs-once-is-enough.patch @@ -0,0 +1,9 @@ +--- k3b-2.0.3.orig/CMakeLists.txt 2014-11-04 19:43:47.000000000 +0100 ++++ k3b-2.0.3/CMakeLists.txt 2015-10-11 15:11:18.653146229 +0200 +@@ -350,6 +350,3 @@ macro_display_feature_log() + + include(MacroOptionalAddSubdirectory) + macro_optional_add_subdirectory( po ) +- +-include(MacroOptionalAddSubdirectory) +-macro_optional_add_subdirectory( doc ) diff --git a/k3b.changes b/k3b.changes index 3d29031..3ab20ef 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 11 13:11:55 UTC 2015 - hrvoje.senjan@gmail.com + +- Added building-docs-once-is-enough.patch: Fix build when CMP002 + policy is set to NEW + ------------------------------------------------------------------- Fri Jun 5 14:03:20 UTC 2015 - wbauer@tmo.at diff --git a/k3b.spec b/k3b.spec index 468f755..29963ca 100644 --- a/k3b.spec +++ b/k3b.spec @@ -1,7 +1,7 @@ # # spec file for package k3b # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Url: http://www.k3b.org/ Source: http://download.kde.org/stable/%{name}/%{name}-%{version}a.tar.xz # PATCH-FIX-OPENSUSE initial-preference.diff llunak@novell.com -- Make the default handler for .iso files instead of Ark Patch0: initial-preference.diff +# PATCH-FIX-OPENSUSE building-docs-once-is-enough.patch -- Fix build when CMP002 policy is set to NEW +Patch1: building-docs-once-is-enough.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -98,6 +100,7 @@ This package contain files needed for development with k3b. %prep %setup -q -n %{name}-%{version} %patch0 +%patch1 -p1 # patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" pushd src/icons/actions