From 84a867afc5e75263782b98e815c56aaf209f959b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 27 Apr 2016 10:53:31 -0500 Subject: [PATCH] 5.21.0-2 - Do not obsolete/provide baloo{-file} in EPEL, use Conflicts (for now) - update URL --- kf5-baloo.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/kf5-baloo.spec b/kf5-baloo.spec index be8060c..c6af3d6 100644 --- a/kf5-baloo.spec +++ b/kf5-baloo.spec @@ -3,12 +3,12 @@ Name: kf5-%{framework} Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality Version: 5.21.0 -Release: 1%{?dist} +Release: 2%{?dist} # libs are LGPL, tools are GPL # KDE e.V. may determine that future LGPL/GPL versions are accepted License: (LGPLv2 or LGPLv3) and (GPLv2 or GPLv3) -URL: https://projects.kde.org/baloo +URL: https://quickgit.kde.org/?p=%{name}.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -44,8 +44,12 @@ BuildRequires: qt5-qtdeclarative-devel Requires: kf5-filesystem >= %{version} Obsoletes: kf5-baloo-tools < 5.5.95-1 +%if 0%{?fedora} Obsoletes: baloo < 5 Provides: baloo = %{version}-%{release} +%else +Conflicts: baloo < 5 +%endif %description %{summary}. @@ -68,9 +72,12 @@ developing applications that use %{name}. Summary: File indexing and search for Baloo # KDE e.V. may determine that future LGPL versions are accepted License: LGPLv2 or LGPLv3 -Obsoletes: %{name} < 5.0.1-2 +%if 0%{?fedora} Obsoletes: baloo-file < 5.0.1-2 Provides: baloo-file = %{version}-%{release} +%else +Conflicts: baloo-file < 5 +%endif Requires: %{name} = %{version}-%{release} %description file %{summary}. @@ -84,9 +91,7 @@ License: LGPLv2 or LGPLv3 %prep -%setup -qn %{framework}-%{version} - -%patch1 -p1 -b .baloofile_config +%autosetup -n %{framework}-%{version} -p1 %build @@ -170,6 +175,10 @@ fi %changelog +* Wed Apr 27 2016 Orion Poplawski - 5.21.0-2 +- Do not obsolete/provide baloo{-file} in EPEL, use Conflicts (for now) +- update URL + * Mon Apr 04 2016 Rex Dieter - 5.21.0-1 - KDE Frameworks 5.21.0