From 1a09143e12b7bdda0e45114df303ada2e70e8059 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 05 2018 02:38:52 +0000 Subject: kholidays-5.44.0 (part of kde frameworks now), epoch++ use %make_build %ldconfig_scriptlets --- diff --git a/.gitignore b/.gitignore index 24bac02..fe9e547 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /kholidays-17.12.0.tar.xz /kholidays-17.12.1.tar.xz /kholidays-17.12.2.tar.xz +/kholidays-5.44.0.tar.xz diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index 44324ef..b16d03b 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -8,28 +8,32 @@ %endif Name: kf5-%{framework} -Version: 17.12.2 +Epoch: 1 +Version: 5.44.0 Release: 1%{?dist} Summary: The KHolidays Library License: LGPLv2+ and GPLv3+ URL: https://cgit.kde.org/%{framework}.git +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -BuildRequires: extra-cmake-modules +BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros -BuildRequires: kf5-kdelibs4support-devel >= 5.15 -BuildRequires: kf5-kitemviews-devel >= 5.15 -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt5-qttools-static + +# qt5-qtbase-devel +BuildRequires: cmake(Qt5Core) +# qt5-qtdeclarative-devel +BuildRequires: cmake(Qt5Qml) +# qt5-qttools-static +BuildRequires: cmake(Qt5LinguistTools) # translations moved here Conflicts: kde-l10n < 17.03 @@ -40,8 +44,7 @@ and other special events for a geographical region. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kf5-kdelibs4support-devel +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -58,7 +61,7 @@ pushd %{_target_platform} -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -77,13 +80,11 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %endif -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f libkholidays5_qt.lang %license COPYING* %{_kf5_libdir}/libKF5Holidays.so.* -%{_kf5_datadir}/kf5/libkholidays/ %{_kf5_qmldir}/org/kde/kholidays/ %files devel @@ -95,6 +96,10 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %changelog +* Sun Mar 04 2018 Rex Dieter - 1:5.44.0-1 +- kholidays-5.44.0 (part of kde frameworks now), epoch++ +- use %%make_build %%ldconfig_scriptlets + * Tue Feb 06 2018 Rex Dieter - 17.12.2-1 - 17.12.2 diff --git a/sources b/sources index 5968879..3d258f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kholidays-17.12.2.tar.xz) = 0ed096b35e1008050c426acafbc1f2fc868ee51f10ead3b6d9bec6cb1710575c5179ba8b8609bff4928ae3cbdd249d896a2e65cbd74bbdecd4488e1d6013b06a +SHA512 (kholidays-5.44.0.tar.xz) = 72e3a0502bb7a7ed8d4f7917f128b956e37eda0c30bd602c90b0fb93ed7eb3841ccffed5989c67306185629e6cf6646deaa9604fcfd2d9b67ac7f40c77e715f3