From ed998d4d87ea5a57215e107dfaef9dc0c4d62c13 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 12:29:02 -0600 Subject: [PATCH] cosmetics, update URL, use %license --- .gitignore | 12 ------------ kf5-networkmanager-qt.spec | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 09e96d9..514bd5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -/networkmanager-qt-5.6.0.tar.xz -/networkmanager-qt-5.7.0.tar.xz -/networkmanager-qt-5.8.0.tar.xz -/networkmanager-qt-5.9.0.tar.xz -/networkmanager-qt-5.10.0.tar.xz -/networkmanager-qt-5.11.0.tar.xz -/networkmanager-qt-5.12.0.tar.xz -/networkmanager-qt-5.13.0.tar.xz -/networkmanager-qt-5.14.0.tar.xz -/networkmanager-qt-5.15.0.tar.xz -/networkmanager-qt-5.16.0.tar.xz -/networkmanager-qt-5.17.0.tar.xz /networkmanager-qt-5.18.0.tar.xz diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index ffd1e48..31575f6 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -2,12 +2,12 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus API Group: System Environment/Libraries License: LGPLv2+ -URL: https://projects.kde.org/projects/frameworks/networkmanager-qt +URL: https://projects.kde.org/networkmanager-qt %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -21,8 +21,8 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra # https://bugs.kde.org/show_bug.cgi?id=352326 Patch0: nm-qt-active-connections.patch -BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel BuildRequires: pkgconfig(NetworkManager) >= 0.9.8 @@ -58,18 +58,19 @@ Requires: pkgconfig(libnm-glib) pkgconfig(libnm-util) 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. + %prep %setup -qn %{framework}-%{version} %patch0 -p1 -b .nm-qt-active-connections + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd @@ -80,21 +81,27 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc COPYING.LIB README.md +%doc README.md +%license COPYING.LIB %{_kf5_libdir}/libKF5NetworkManagerQt.so.* %files devel %{_kf5_libdir}/libKF5NetworkManagerQt.so -%{_kf5_libdir}/cmake/KF5NetworkManagerQt -%{_kf5_includedir}/NetworkManagerQt +%{_kf5_libdir}/cmake/KF5NetworkManagerQt/ +%{_kf5_includedir}/NetworkManagerQt/ %{_kf5_includedir}/networkmanagerqt_version.h %{_kf5_archdatadir}/mkspecs/modules/qt_NetworkManagerQt.pri + %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-3 +- cosmetics, update URL, use %%license + * Tue Jan 05 2016 Jan Grulich - 5.18.0-2 - Re-check connection state before we watch changes in case it gets changed too quickly kdebz:#352326