Accepting request 442944 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/442944
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=67

k3b.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov 30 18:31:00 UTC 2016 - wbauer@tmo.at
+
+- Obsolete k3b-codecs, the additional codecs are part of the main
+  package now
+
+-------------------------------------------------------------------
+Tue Nov 29 07:32:14 UTC 2016 - olaf@aepfle.de
+
+- Restore conditionals for lame and libmad
+
+-------------------------------------------------------------------
+Tue Nov 29 07:20:36 UTC 2016 - olaf@aepfle.de
+
+- Expand macro kde4_runtime_requires only when its available
+  to fix quilt setup
+
 -------------------------------------------------------------------
 Mon Jul 25 11:28:39 UTC 2016 - olaf@aepfle.de
 

k3b.spec

@@ -17,6 +17,8 @@
 
 
 %bcond_without ffmpeg
+%bcond_with    lame
+%bcond_with    mad
 
 Name:           k3b
 Version:        2.0.3
@@ -52,6 +54,13 @@ BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 %endif
+%if %{with lame}
+BuildRequires:  libmp3lame-devel
+Requires:       lame
+%endif
+%if %{with mad}
+BuildRequires:  pkgconfig(mad)
+%endif
 Requires:       %{_bindir}/cdrdao
 Requires:       %{_bindir}/cdrecord
 Requires:       %{_bindir}/mkisofs
@@ -68,8 +77,9 @@ Recommends:     %{name}-lang = %{version}
 Recommends:     vcdimager
 Provides:       kde4-k3b = 4.2.2.svn951754
 Obsoletes:      kde4-k3b < 4.2.2.svn951754
+Obsoletes:      k3b-codecs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{kde4_runtime_requires}
+%{?kde4_runtime_requires}
 
 %description
 Featuring a simple, yet powerful graphical interface, k3b provides various