[kmix] 14.12.1

[Rex Dieter]

commit 4d42fcd71f2bf016999010ed4c5d3b984b707419
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Feb 7 08:50:30 2015 -0600

    14.12.1

 .gitignore |   28 +---------------------
 kmix.spec  |   76 +++++++++++++++++++++++++++++++++++++++++++++++------------
 sources    |    2 +-
 3 files changed, 62 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4833326..b5b5fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1 @@
-/kmix-4.10.4.tar.xz
-/kmix-4.10.90.tar.xz
-/kmix-4.10.95.tar.xz
-/kmix-4.10.97.tar.xz
-/kmix-4.11.0.tar.xz
-/kmix-4.11.1.tar.xz
-/kmix-4.11.2.tar.xz
-/kmix-4.11.3.tar.xz
-/kmix-4.11.90.tar.xz
-/kmix-4.11.95.tar.xz
-/kmix-4.11.97.tar.xz
-/kmix-4.12.0.tar.xz
-/kmix-4.12.1.tar.xz
-/kmix-4.12.2.tar.xz
-/kmix-4.12.3.tar.xz
-/kmix-4.12.90.tar.xz
-/kmix-4.12.95.tar.xz
-/kmix-4.12.97.tar.xz
-/kmix-4.13.0.tar.xz
-/kmix-4.13.1.tar.xz
-/kmix-4.13.2.tar.xz
-/kmix-4.13.3.tar.xz
-/kmix-4.13.97.tar.xz
-/kmix-4.14.0.tar.xz
-/kmix-4.14.1.tar.xz
-/kmix-4.14.2.tar.xz
-/kmix-4.14.3.tar.xz
+/kmix-14.12.1.tar.xz
diff --git a/kmix.spec b/kmix.spec
index d596b7a..7f8fa9c 100644
--- a/kmix.spec
+++ b/kmix.spec
@@ -1,7 +1,12 @@
+
+%if 0%{?fedora} > 21
+%global kf5 1
+%endif
+
 Name:    kmix 
 Summary: KDE volume control 
-Version: 4.14.3
-Release: 2%{?dist}
+Version: 14.12.1
+Release: 1%{?dist}
 
 # code is LGPLv2+ except for gui/osdwidget.* which is GPLv2+
 # docs GFDL
@@ -22,13 +27,25 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 Patch1: kmix-4.11.97-autostart.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
 BuildRequires: pkgconfig(alsa)
+# FIXME/TODO: kf5 build seems to expects libcanberra cmake support, update? -- rex
 BuildRequires: pkgconfig(libcanberra)
 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
 BuildRequires: pkgconfig(phonon)
-
+%if 0%{?kf5}
+BuildRequires: extra-cmake-modules
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kglobalaccel-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kcmutils-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Gui)
+%else
+BuildRequires: kdelibs4-devel >= 4.14.4
 %{?kde_runtime_requires}
+%endif
 
 # when split occurred
 Obsoletes: kdemultimedia-kmix < 6:4.8.80
@@ -47,7 +64,11 @@ Provides:  kdemultimedia-kmix = 6:%{version}-%{release}
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
+%if 0%{?kf5}
+%{cmake_kf5} -DKMIX_KF5_BUILD:BOOL=ON ..
+%else
 %{cmake_kde4} ..
+%endif
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -56,6 +77,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 0%{?kf5}
+touch %{name}.lang
+%else
 # fix documentation multilib conflict in index.cache
 bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/kmix/index.cache.bz2
 sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kmix/index.cache
@@ -63,47 +87,67 @@ sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kmix/index
 bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/kmix/index.cache
 
 %find_lang %{name} --with-kde --without-mo
+%endif
 
 
 %check
+%if 0%{?kf5}
+desktop-file-validate %{buildroot}%{_datadir}/applications/kmix.desktop
+%else
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmix.desktop
+%endif
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog COPYING COPYING.DOC TODO
+%{_datadir}/dbus-1/interfaces/org.kde.kmix.control.xml
+%{_datadir}/dbus-1/interfaces/org.kde.kmix.mixer.xml
+%{_datadir}/dbus-1/interfaces/org.kde.kmix.mixset.xml
+%{_datadir}/icons/hicolor/*/*/kmix.*
+%if 0%{?kf5}
+%{_kf5_bindir}/kmix
+%{_kf5_bindir}/kmixctrl
+%{_kf5_bindir}/kmixremote
+%{_kf5_datadir}/applications/kmix.desktop
+%{_kf5_datadir}/kmix/
+%{_kf5_libdir}/libkdeinit5_kmix.so
+%{_kf5_libdir}/libkdeinit5_kmixctrl.so
+%{_qt5_plugindir}/libkded_kmixd.so
+%{_sysconfdir}/xdg/autostart/restore_kmix_volumes.desktop
+%{_sysconfdir}/xdg/autostart/kmix_autostart.desktop
+%{_kf5_datadir}/kservices5/kded/kmixd.desktop
+%{_kf5_datadir}/kservices5/kmixctrl_restore.desktop
+%else
 %{_kde4_appsdir}/kmix/
-%{_kde4_appsdir}/plasma/services/mixer.operations
 %{_kde4_bindir}/kmix
 %{_kde4_bindir}/kmixctrl
 %{_kde4_bindir}/kmixremote
 %{_kde4_datadir}/applications/kde4/kmix.desktop
 %{_kde4_datadir}/autostart/*.desktop
-%{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.control.xml
-%{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.mixer.xml
-%{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.mixset.xml
 %{_kde4_datadir}/kde4/services/kded/kmixd.desktop
 %{_kde4_datadir}/kde4/services/kmixctrl_restore.desktop
-%{_kde4_datadir}/kde4/services/plasma-engine-mixer.desktop
-%{_kde4_iconsdir}/hicolor/*/*/kmix.*
 %{_kde4_libdir}/libkdeinit4_kmix.so
 %{_kde4_libdir}/libkdeinit4_kmixctrl.so
 %{_kde4_libdir}/kde4/kded_kmixd.so
-%{_kde4_libdir}/kde4/plasma_engine_mixer.so
+%endif
 
 
 %changelog
+* Sat Feb 07 2015 Rex Dieter <rdieter at fedoraproject.org>  14.12.1-1
+- 14.12.1
+
 * Sat Jan 17 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-2
 - kde-applications fixes, cleanup
 
diff --git a/sources b/sources
index 67115e5..a4cea4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0291dc7fb9fae98a56e875ea883397cd  kmix-4.14.3.tar.xz
+66778eac4c511c7d572c4560ce2a179f  kmix-14.12.1.tar.xz