diff --git a/initial-preference.diff b/initial-preference.diff index d08e2c7..1e518fc 100644 --- a/initial-preference.diff +++ b/initial-preference.diff @@ -1,6 +1,6 @@ --- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100 +++ src/k3b.desktop 2011-01-16 12:06:51.077000058 +0100 -@@ -142,3 +142,4 @@ +@@ -169,3 +169,4 @@ X-KDE-NativeMimeType=application/x-k3b; Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem; X-DBUS-ServiceType=Unique diff --git a/k3b.changes b/k3b.changes index 3fcde1c..280d024 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Jan 4 14:02:32 UTC 2016 - tittiatcoke@gmail.com + +- Use the internal ffmpeg package to build. + This would prevent to swap k3b with the one from packman to have + mp3 support + +------------------------------------------------------------------- +Thu Dec 24 12:21:32 UTC 2015 - alarrosa@suse.com + +- Added Requires(post/un) hicolor-icon-theme since it's needed by + %icon_theme_cache_post/un + +------------------------------------------------------------------- +Wed Dec 23 14:24:57 UTC 2015 - alarrosa@suse.com + +- Updated initial-preference.diff so it applies without any offset + ------------------------------------------------------------------- Fri Nov 6 14:16:44 UTC 2015 - tchvatal@suse.com diff --git a/k3b.spec b/k3b.spec index a5f2a4a..b91ba31 100644 --- a/k3b.spec +++ b/k3b.spec @@ -1,7 +1,7 @@ # # spec file for package k3b # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,11 +41,21 @@ BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(taglib) +%if 0%{?suse_version} > 1310 && 0%{?is_opensuse} +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libpostproc) +BuildRequires: pkgconfig(libswscale) +%endif Requires: %{_bindir}/cdrdao Requires: %{_bindir}/cdrecord Requires: %{_bindir}/mkisofs Requires: %{_bindir}/readcd Requires: dvd+rw-tools +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme Requires(post): shared-mime-info Requires(postun): shared-mime-info Recommends: %{_bindir}/normalize @@ -57,11 +67,6 @@ Provides: kde4-k3b = 4.2.2.svn951754 Obsoletes: kde4-k3b < 4.2.2.svn951754 BuildRoot: %{_tmppath}/%{name}-%{version}-build %{kde4_runtime_requires} -%if 0%{?BUILD_ORIG} -BuildRequires: libffmpeg-devel -BuildRequires: libmad-devel -BuildRequires: libmp3lame-devel -%endif %description Featuring a simple, yet powerful graphical interface, k3b provides various