From fc5016760bc621a8f67c573e354ded7881298c9c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 15 Dec 2015 16:20:17 +0100 Subject: [PATCH] Remove obsoletes/conflicts with kdepimlibs --- kf5-kholidays.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index 63c3999..158054c 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 15.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The KHolidays Library License: LGPLv2+ and GPLv3+ @@ -24,8 +24,6 @@ BuildRequires: qt5-qttools-static BuildRequires: kf5-kdelibs4support-devel >= 5.15 BuildRequires: kf5-kitemviews-devel >= 5.15 -Obsoletes: kdepimlibs%{?_isa} < 15.08.0 -Conflicts: kdepimlibs%{?_isa} < 15.08.0 %description The KHolidays library provides a C++ API that determines holiday @@ -35,8 +33,6 @@ and other special events for a geographical region. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: kf5-kdelibs4support-devel -Obsoletes: kdepimlibs-devel%{?_isa} < 15.08.0 -Conflicts: kdepimlibs-devel%{?_isa} < 15.08.0 %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -74,6 +70,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Dec 15 2015 Jan Grulich - 15.12.0-2 +- Remove obsoletes/conflicts with kdepimlibs + * Tue Dec 15 2015 Jan Grulich - 15.12-0-1 - Update to 15.12.0