From c57d40789c3be078f125313e69251afa25db8de1f8d4dcecb509d515735e9e68 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 29 Nov 2016 09:24:55 +0000 Subject: [PATCH] Accepting request 442595 from home:olh:branches:KDE:Extra Expand macro kde4_runtime_requires only when its available to fix quilt setup OBS-URL: https://build.opensuse.org/request/show/442595 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=5 --- kdiff3.changes | 6 ++++++ kdiff3.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kdiff3.changes b/kdiff3.changes index e1a05df..aacf9d3 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 29 07:20:36 UTC 2016 - olaf@aepfle.de + +- Expand macro kde4_runtime_requires only when its available + to fix quilt setup + ------------------------------------------------------------------- Wed Jun 24 08:08:27 UTC 2015 - wbauer@tmo.at diff --git a/kdiff3.spec b/kdiff3.spec index 29f99c9..2725d01 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -29,7 +29,7 @@ BuildRequires: libkde4-devel BuildRequires: libkonq-devel Recommends: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +%{?kde4_runtime_requires} %description KDiff3 is a program that: