rpm/k3b
SHA256
1
0
Fork 0
forked from pool/k3b
Code Pull Requests Activity

Accepting request 337919 from KDE:Extra

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2015-10-12 08:01:19 +00:00 committed by Git OBS Bridge
parent 09bcac28b9
commit 86f5afbfe4
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
building-docs-once-is-enough.patch Normal file
View File

@ -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 )

6
k3b.changes
View File

@ -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 Fri Jun 5 14:03:20 UTC 2015 - wbauer@tmo.at

5
k3b.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package k3b # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # PATCH-FIX-OPENSUSE initial-preference.diff llunak@novell.com -- Make the default handler for .iso files instead of Ark
Patch0: initial-preference.diff 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -98,6 +100,7 @@ This package contain files needed for development with k3b.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 %patch0
%patch1 -p1
# patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" # patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size"
pushd src/icons/actions pushd src/icons/actions