From 353ad3db4ce637119dcd97e1abd9d4aa2e514a4f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jan 19 2015 21:13:54 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 17bbc42..e18a11a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
 /audiocd-kio-4.14.1.tar.xz
 /audiocd-kio-4.14.2.tar.xz
 /audiocd-kio-4.14.3.tar.xz
+/audiocd-kio-14.11.97.tar.xz
+/audiocd-kio-14.12.1.tar.xz
diff --git a/audiocd-kio.spec b/audiocd-kio.spec
index 6c13480..1e7bf34 100644
--- a/audiocd-kio.spec
+++ b/audiocd-kio.spec
@@ -1,6 +1,6 @@
 Name:    audiocd-kio 
 Summary: Audiocd kio slave
-Version: 4.14.3
+Version: 14.12.1
 Release: 1%{?dist}
 
 # code GPLv2+, handbook/docs GFDL
@@ -12,12 +12,12 @@ URL:     https://projects.kde.org/projects/kde/kdemultimedia/%{name}
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstream patches
 
 BuildRequires: cdparanoia-devel cdparanoia
-BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs4-devel >= 4.14
 BuildRequires: libkcddb-devel >= %{version}
 BuildRequires: libkcompactdisc-devel >= %{version}
 BuildRequires: pkgconfig(flac)
@@ -26,7 +26,7 @@ BuildRequires: pkgconfig(theora)
 BuildRequires: pkgconfig(vorbis)
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
+%{?kde_runtime_requires}
 
 # when split occurred
 Obsoletes: kdemultimedia-kio_audiocd < 6:4.8.80
@@ -39,7 +39,7 @@ Provides:  kio_audiocd = %{version}-%{release}
 %package libs
 Summary: Runtime libraries for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
+%{?kdelibs4_requires}
 Requires: libkcddb%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 Requires: libkcompactdisc%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 # when split occurred
@@ -115,6 +115,12 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/audiocd/index.cache
 
 
 %changelog
+* Sat Jan 17 2015 Rex Dieter <rdieter@fedoraproject.org> - 14.12.1-1
+- 14.12.1
+
+* Tue Dec 09 2014 Rex Dieter <rdieter@fedoraproject.org> - 14.11.97-1
+- 14.11.97
+
 * Sat Nov 08 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.3-1
 - 4.14.3
 
diff --git a/sources b/sources
index 95c76c2..4305b5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f298189165b4c864527090b50beb904d  audiocd-kio-4.14.3.tar.xz
+fa1a1fbdb31b5b18ee9f621043ae6585  audiocd-kio-14.12.1.tar.xz