diff --git a/.gitignore b/.gitignore index f460318..5d5bf05 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/solid-4.99.0.tar.xz -/solid-4.100.0.tar.xz -/solid-5.0.0.tar.xz -/solid-5.1.0.tar.xz -/solid-5.2.0.tar.xz -/solid-5.3.0.tar.xz -/solid-5.4.0.tar.xz -/solid-5.5.0.tar.xz -/solid-5.6.0.tar.xz -/solid-5.7.0.tar.xz -/solid-5.8.0.tar.xz -/solid-5.9.0.tar.xz -/solid-5.10.0.tar.xz -/solid-5.11.0.tar.xz -/solid-5.12.0.tar.xz -/solid-5.13.0.tar.xz -/solid-5.14.0.tar.xz -/solid-5.15.0.tar.xz -/solid-5.16.0.tar.xz -/solid-5.17.0.tar.xz /solid-5.18.0.tar.xz diff --git a/kf5-solid.spec b/kf5-solid.spec index a9fe3f7..f71d9d8 100644 --- a/kf5-solid.spec +++ b/kf5-solid.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 integration module that provides hardware information License: LGPLv2+ -URL: http://www.kde.org +URL: http://projects.kde.org/solid %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -17,14 +17,13 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -BuildRequires: libupnp-devel -BuildRequires: systemd-devel - -BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: libupnp-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel +BuildRequires: systemd-devel %if ! 0%{?bootstrap} # Predicate parser deps @@ -70,39 +69,46 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} + %install -%make_install -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %find_lang solid5_qt --with-qt --all-name %files -%doc COPYING.LIB README.md TODO +%doc README.md TODO +%license COPYING.LIB %{_kf5_bindir}/solid-hardware5 %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -f solid5_qt.lang -%{_kf5_qmldir}/org/kde/solid +%{_kf5_qmldir}/org/kde/solid/ %{_kf5_libdir}/libKF5Solid.so.* %files devel %{_kf5_includedir}/solid_version.h -%{_kf5_includedir}/Solid +%{_kf5_includedir}/Solid/ %{_kf5_libdir}/libKF5Solid.so -%{_kf5_libdir}/cmake/KF5Solid +%{_kf5_libdir}/cmake/KF5Solid/ %{_kf5_archdatadir}/mkspecs/modules/qt_Solid.pri %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-2 +- cosmetics, update URL, use %%license + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0