diff --git a/.gitignore b/.gitignore index f64f232..c358935 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1 @@ -/kalarmcal-16.08.1.tar.xz -/kalarmcal-16.08.2.tar.xz -/kalarmcal-16.08.3.tar.xz -/kalarmcal-16.12.1.tar.xz -/kalarmcal-16.12.2.tar.xz -/kalarmcal-16.12.3.tar.xz -/kalarmcal-17.04.1.tar.xz -/kalarmcal-17.04.2.tar.xz -/kalarmcal-17.04.3.tar.xz -/kalarmcal-17.08.1.tar.xz -/kalarmcal-17.08.3.tar.xz -/kalarmcal-17.11.80.tar.xz -/kalarmcal-17.11.90.tar.xz -/kalarmcal-17.12.0.tar.xz -/kalarmcal-17.12.1.tar.xz -/kalarmcal-17.12.2.tar.xz -/kalarmcal-17.12.3.tar.xz /kalarmcal-18.04.0.tar.xz diff --git a/kf5-kalarmcal.spec b/kf5-kalarmcal.spec index 4677446..2fb8749 100644 --- a/kf5-kalarmcal.spec +++ b/kf5-kalarmcal.spec @@ -25,6 +25,7 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{ BuildRequires: extra-cmake-modules BuildRequires: kf5-rpm-macros + BuildRequires: kf5-kdelibs4support-devel >= 5.15 #global majmin_ver %(echo %{version} | cut -d. -f1,2) %global majmin_ver %{version} @@ -32,6 +33,8 @@ BuildRequires: kf5-akonadi-server-devel >= %{majmin_ver} BuildRequires: kf5-kcalendarcore-devel >= %{majmin_ver} BuildRequires: kf5-kidentitymanagement-devel >= %{majmin_ver} BuildRequires: kf5-kholidays-devel >= %{majmin_ver} +BuildRequires: kf5-kcalendarutils-devel >= %{majmin_ver} + BuildRequires: qt5-qtbase-devel %if 0%{?tests} BuildRequires: dbus-x11 @@ -65,7 +68,7 @@ pushd %{_target_platform} -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -83,14 +86,12 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %endif -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f %{name}.lang %doc README %license COPYING* -%{_kf5_sysconfdir}/xdg/kalarmcal.categories -%{_kf5_sysconfdir}/xdg/kalarmcal.renamecategories +%{_kf5_sysconfdir}/xdg/kalarmcal.* %{_kf5_libdir}/libKF5AlarmCalendar.so.* %files devel