cleanup, use %majmin, drop old Obsoletes, drop -libs

.gitignore

@@ -1,5 +1,2 @@
-/solid-5.43.0.tar.xz
-/solid-5.44.0.tar.xz
-/solid-5.45.0.tar.xz
 /solid-5.46.0.tar.xz
 /solid-5.47.0.tar.xz

kf5-solid.spec

@@ -2,25 +2,25 @@
 
 Name:    kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 1 integration module that provides hardware information
 
 License: LGPLv2+
 URL:     https://solid.kde.org/
 
-%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
 
 ## upstreamable patches
 
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  libupnp-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
@@ -44,13 +44,11 @@ Requires:       upower
 %endif
 %endif
 
-Requires:       kf5-filesystem >= %{version}
+Requires:       kf5-filesystem >= %{majmin}
 
-Provides:       %{name}-runtime = %{version}-%{release}
-Provides:       %{name}-runtime%{?_isa} = %{version}-%{release}
-Obsoletes:      %{name}-runtime < 4.99.0.1
-
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Obsoletes:      kf5-solid-libs < 5.47-2
+Provides:       kf5-solid-libs = %{version}-%{release}
+Provides:       kf5-solid-libs%{?_isa} = %{version}-%{release}
 
 %description
 Solid provides the following features for application developers:
@@ -58,14 +56,6 @@ Solid provides the following features for application developers:
  - Power Management
  - Network Management
 
-%package        libs
-Summary:        Runtime libraries for Solid Framework
-# When the split occured
-Conflicts:      %{name} < 5.4.0-1
-Requires:       %{name} = %{version}-%{release}
-%description    libs
-%{summary}.
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -94,14 +84,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang_kf5 solid5_qt
 
 
+%ldconfig_scriptlets
+
 %files -f solid5_qt.lang
 %doc README.md TODO
 %license COPYING.LIB
 %{_kf5_bindir}/solid-hardware5
-
-%ldconfig_scriptlets libs
-
-%files libs
+#files libs
 %{_kf5_qmldir}/org/kde/solid/
 %{_kf5_libdir}/libKF5Solid.so.*
 
@@ -114,6 +103,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup, use %%majmin, drop old Obsoletes, drop -libs
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0