5.3.1-2

- re-add versioned Conflicts: kde-workspace (gives hints on upgrade path for older releases)
- improve Obsoletes: khotkeys-libs
- improve %find_lang usage
- -devel: move dbus-1 xml interface here
- .spec cosmetics

khotkeys.spec

@@ -1,6 +1,6 @@
 Name:           khotkeys
 Version:        5.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application to configure hotkeys in KDE
 
 License:        GPLv2+
@@ -36,7 +36,12 @@ BuildRequires:  libX11-devel
 
 Requires:       kf5-filesystem
 
-Obsoletes:      khotkeys-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+# when khotkeys was split out of kde-workspace-4.11.x
+Conflicts:      kde-workspace < 4.11.15-3
+
+# upgrade path from khotkeys-libs-4.11.x (skip Provides for now, it was only ever a private library)
+Obsoletes:      khotkeys-libs < 5.0.0
+#Provides:       khotkeys-libs = %{version}-%{release}
 
 %description
 An advanced editor component which is used in numerous KDE applications
@@ -44,6 +49,7 @@ requiring a text editing component.
 
 %package        devel
 Summary:        Development files for %{name}
+# strictly speaking, not required in this case, but still often expected to pull in subpkg -- rex
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -53,38 +59,50 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
+
 %build
 
-mkdir -p %{_target_platform}
+
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang khotkeys5 --with-qt --with-kde --all-name
 
-%post -p /sbin/ldconfig
+%find_lang khotkeys
 
+
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f khotkeys5.lang
+%files -f khotkeys.lang
 %doc COPYING
 %{_kf5_libdir}/libkhotkeysprivate.so.*
 %{_kf5_qtplugindir}/kcm_hotkeys.so
 %{_kf5_qtplugindir}/kded_khotkeys.so
 %{_kf5_datadir}/kservices5/kded/*.desktop
 %{_kf5_datadir}/kservices5/khotkeys.desktop
-%{_datadir}/khotkeys
-%{_datadir}/dbus-1/interfaces/*.xml
-%{_datadir}/doc/HTML/en/kcontrol/khotkeys
+%{_datadir}/khotkeys/
+%{_datadir}/doc/HTML/en/kcontrol/khotkeys/
 
 %files devel
-%{_libdir}/cmake/KHotKeysDBusInterface
+%{_datadir}/dbus-1/interfaces/org.kde.khotkeys.xml
+%{_libdir}/cmake/KHotKeysDBusInterface/
+
 
 %changelog
+* Tue Jun 09 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.3.1-2
+- re-add versioned Conflicts: kde-workspace (gives hints on upgrade path for older releases)
+- improve Obsoletes khotkeys-libs
+- improve %%find_lang usage
+- -devel: move dbus-1 xml interface here
+- .spec cosmetics
+
 * Tue May 26 2015 Daniel Vrátil <dvratil@redhat.com> - 5.3.1-1
 - Plasma 5.3.1