diff --git a/.gitignore b/.gitignore index 1f6d382..697f15e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1 @@ -/kemoticons-5.18.0.tar.xz -/kemoticons-5.19.0.tar.xz -/kemoticons-5.20.0.tar.xz -/kemoticons-5.21.0.tar.xz -/kemoticons-5.22.0.tar.xz -/kemoticons-5.23.0.tar.xz -/kemoticons-5.24.0.tar.xz -/kemoticons-5.25.0.tar.xz -/kemoticons-5.26.0.tar.xz -/kemoticons-5.27.0.tar.xz -/kemoticons-5.29.0.tar.xz -/kemoticons-5.31.0.tar.xz -/kemoticons-5.32.0.tar.xz -/kemoticons-5.33.0.tar.xz -/kemoticons-5.34.0.tar.xz -/kemoticons-5.35.0.tar.xz -/kemoticons-5.36.0.tar.xz -/kemoticons-5.37.0.tar.xz -/kemoticons-5.38.0.tar.xz -/kemoticons-5.39.0.tar.xz -/kemoticons-5.40.0.tar.xz -/kemoticons-5.41.0.tar.xz -/kemoticons-5.42.0.tar.xz -/kemoticons-5.43.0.tar.xz -/kemoticons-5.44.0.tar.xz -/kemoticons-5.45.0.tar.xz -/kemoticons-5.46.0.tar.xz /kemoticons-5.47.0.tar.xz diff --git a/kf5-kemoticons.spec b/kf5-kemoticons.spec index a503892..aaf7bce 100644 --- a/kf5-kemoticons.spec +++ b/kf5-kemoticons.spec @@ -1,35 +1,33 @@ %global framework kemoticons -Name: kf5-%{framework} +Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 3 module with support for emoticons and emoticons themes +Release: 2%{?dist} +Summary: KDE Frameworks 5 Tier 3 module with support for emoticons and emoticons themes -License: GPLv2+ and LGPLv2+ -URL: https://cgit.kde.org/%{framework}.git +License: GPLv2+ and LGPLv2+ +URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%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}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz # filter plugin provides %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$ -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-karchive-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-kservice-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-karchive-devel >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-kservice-devel >= %{majmin} +BuildRequires: kf5-rpm-macros BuildRequires: qt5-qtbase-devel -Requires: kf5-filesystem >= %{version} - %description KDE Frameworks 5 Tier 3 module that provides emoticons themes as well as helper classes to automatically convert text emoticons to graphical emoticons. @@ -37,7 +35,7 @@ helper classes to automatically convert text emoticons to graphical emoticons. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kf5-kservice-devel >= %{version} +Requires: kf5-kservice-devel >= %{majmin} Requires: qt5-qtbase-devel %description devel The %{name}-devel package contains libraries and header files for @@ -54,15 +52,14 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc README.md @@ -84,6 +81,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup, use %%majmin %%make_build %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0