From 4c89ba377fa9e7b8d47e8b662f5c6b815c753ea3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Apr 2015 13:11:19 -0500 Subject: [PATCH] Conflicts: libkpeople (#1208946) --- kf5-kpeople.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec index b393696..128c51b 100644 --- a/kf5-kpeople.spec +++ b/kf5-kpeople.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 library for contact and people aggregation License: LGPLv2+ @@ -17,6 +17,10 @@ URL: https://projects.kde.org/projects/frameworks/kpeople %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +## Temporary, see http://bugzilla.redhat.com/1208946 +Conflicts: libkpeople < 1.0 +## Once ktp-kf5 stack is ready, switch Conflicts to Obsoletes +#Obsoletes: libkpeople < 1.0 BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -38,6 +42,8 @@ KDE Frameworks 5 Tier 3 library for interaction with XML RPC services. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel +## enable when ktp-kf5 stack is updated +#Obsoletes: libkpeople-devel < 1.0 %description devel The %{name}-devel package contains libraries and header files for @@ -83,5 +89,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_archdatadir}/mkspecs/modules/qt_KPeopleWidgets.pri %changelog +* Sat Apr 04 2015 Rex Dieter 5.8.0-2 +- Conflicts: libkpeople (#1208946) + * Mon Mar 16 2015 Daniel Vrátil - 5.8.0-1 - KDE Frameworks 5.8.0