diff --git a/apper.spec b/apper.spec index ebe83af..a0c5083 100644 --- a/apper.spec +++ b/apper.spec @@ -1,5 +1,3 @@ -%define pk_min_version 0.9.2 - ## appstream disabled, just not ready yet, ## https://bugzilla.redhat.com/1180819#c20 #define appstream 1 @@ -11,7 +9,7 @@ Name: apper Summary: KDE interface for PackageKit Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ %if 0%{?snap:1} @@ -52,15 +50,12 @@ BuildRequires: pkgconfig(appstream) #Requires: appstream-data %endif BuildRequires: pkgconfig(dbus-1) -%if 0%{?pk_version:1} -BuildRequires: PackageKit-Qt-devel >= %{pk_version} -%else -BuildRequires: pkgconfig(packagekitqt4) >= %{pk_min_version} -%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo %{pk_min_version}) -%endif +BuildRequires: pkgconfig(packagekitqt4) >= 0.9.2 +%global pk_version %(pkg-config --modversion packagekitqt4 2> /dev/null || echo 0.9.2) %{?kde_runtime_requires} Requires: PackageKit-Qt%{?_isa} >= %{pk_version} +Requires: PackageKit %if 0%{?plasma5} Requires: plasma-pk-updates %endif @@ -82,7 +77,7 @@ rm -fv po/*/plasma_applet_org.packagekit.updater.po %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} \ %{?appinstall:-DAPPINSTALL:BOOL=ON} \ @@ -95,7 +90,6 @@ make %{?_smp_mflags} -C %{_target_platform} %install - make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang apper --all-name --with-kde || echo "WARNING: missing translations" @@ -130,7 +124,8 @@ update-desktop-database -q 2> /dev/null ||: fi %files -f apper.lang -%doc COPYING TODO +%doc TODO +%license COPYING %{_kde4_bindir}/apper %{_kde4_libdir}/apper/ %{_kde4_libdir}/kde4/kcm_apper.so @@ -158,6 +153,9 @@ fi %changelog +* Thu Oct 29 2015 Rex Dieter 0.9.2-2 +- .spec cosmetics, use %%license, (explicitly) Requires: PackageKit + * Wed Oct 28 2015 Rex Dieter 0.9.2-1 - 0.9.2, upstream patches