From 2d67e291f5c71de5c6d3212da15c219f88dbe6e8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 08 2015 10:16:59 +0000 Subject: drop Conflicts: kio_mtp (no longer needed with renamed catalog) --- diff --git a/kio-extras.spec b/kio-extras.spec index 85f2f7d..dafff0b 100644 --- a/kio-extras.spec +++ b/kio-extras.spec @@ -1,6 +1,6 @@ Name: kio-extras Version: 5.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Additional components to increase the functionality of KIO Framework License: GPLv2+ @@ -54,9 +54,6 @@ BuildRequires: lzma-devel Requires: kf5-filesystem -# translation conflicts -Conflicts: kio_mtp < 0.75-7 -Conflicts: kio_mtp-common < 0.75-10 # short-lived subpkg, locale conflicts fixed in kio_mtp instead Obsoletes: kio-extras-mtp-common < 5.2.2-3 @@ -173,6 +170,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Apr 08 2015 Rex Dieter 5.2.2-5 +- drop Conflicts: kio_mtp (no longer needed with renamed catalog) + * Tue Apr 07 2015 Rex Dieter 5.2.2-4 - temporarily adjust kio_mtp catalog until kde4 updates hit stable