From 118c49b58c816faf12102a477289671488438c36 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 08 2018 14:20:10 +0000 Subject: fix build update deps, .spec cosmetics, drop old Obsoletes --- diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index f57cf08..2344fd9 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -8,38 +8,27 @@ Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus License: 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 BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel -BuildRequires: pkgconfig(NetworkManager) >= 0.9.8 -%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 BuildRequires: pkgconfig(libnm) -%else -BuildRequires: pkgconfig(libnm-glib) pkgconfig(libnm-util) -%endif %if 0%{?fedora} > 22 Recommends: NetworkManager %else Requires: NetworkManager >= 0.9.9.0 %endif -Requires: kf5-filesystem >= %{version} - -# libmm-qt has been retired in F22 -%if 0%{?fedora} >= 22 -Obsoletes: libnm-qt < 5.10.0 -Provides: libnm-qt%{?_isa} = %{version}-%{release} -%endif +Requires: kf5-filesystem >= %{majmin} %description A Tier 1 KDE Frameworks 5 Qt library for NetworkManager. @@ -48,15 +37,7 @@ A Tier 1 KDE Frameworks 5 Qt library for NetworkManager. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel -%if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 Requires: pkgconfig(libnm) -%else -Requires: pkgconfig(libnm-glib) pkgconfig(libnm-util) -%endif -%if 0%{?fedora} >= 22 -Obsoletes: libnm-qt-devel < 5.10.0-1 -Provides: libnm-qt-devel%{?_isa} = %{version}-%{release} -%endif %description devel Qt libraries and header files for developing applications that use NetworkManager. @@ -65,21 +46,21 @@ that use NetworkManager. %prep %autosetup -p1 -n %{framework}-%{version} + %build mkdir %{_target_platform} 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