From 11284aeada36d64ee98db7673ad642809eee9d99 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 4 Dec 2015 13:24:28 +0100 Subject: [PATCH] Update to 15.11.80 --- .gitignore | 1 + kf5-kholidays.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e51f384..e4f7da6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kholidays-15.08.0.tar.xz +/kholidays-15.11.80.tar.xz diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index e43cce2..6872ae9 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -1,11 +1,11 @@ %global framework kholidays Name: kf5-%{framework} -Version: 15.08.0 -Release: 2%{?dist} +Version: 15.11.80 +Release: 1%{?dist} Summary: The KHolidays Library -License: LGPLv2+ and GPLv3+ +License: GPLv2+ URL: https://projects.kde.org/projects/kde/pim/%{framework} %global revision %(echo %{version} | cut -d. -f3) @@ -21,8 +21,11 @@ BuildRequires: extra-cmake-modules BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-static -BuildRequires: kf5-kdelibs4support-devel >= 5.12 -BuildRequires: kf5-kitemviews-devel >= 5.12 +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 @@ -32,6 +35,8 @@ 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}. @@ -64,14 +69,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_kf5_includedir}/kholidays_version.h %{_kf5_includedir}/KHolidays %{_kf5_libdir}/libKF5Holidays.so -%{_kf5_qtplugindir}/designer/holidays5widgets.so %{_kf5_libdir}/cmake/KF5Holidays %{_kf5_archdatadir}/mkspecs/modules/qt_KHolidays.pri %changelog -* Mon Aug 31 2015 Daniel Vrátil - 15.08.0-2 -- Remove obsoletes/conflicts kdepimlibs (not true) +* Thu Dec 03 2015 Jan Grulich - 15.11.80-1 +- Update to 15.11.80 * Mon Aug 24 2015 Daniel Vrátil - 15.08.0-1 - Initial version diff --git a/sources b/sources index 0f07391..d96059c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b6e2eeedef346b59614dd722a01cc8f kholidays-15.08.0.tar.xz +728ee9f77fe5f0d862eb2fb66fc3ce55 kholidays-15.11.80.tar.xz