Hello community, here is the log from the commit of package kid3 for openSUSE:Factory checked in at 2016-08-05 18:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kid3 (Old) and /work/SRC/openSUSE:Factory/.kid3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kid3" Changes: -------- --- /work/SRC/openSUSE:Factory/kid3/kid3.changes 2016-06-29 15:10:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kid3.new/kid3.changes 2016-08-05 18:16:33.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jul 28 09:00:34 UTC 2016 - [email protected] + +- Convert BuildRequires libchromaprint-with-ffmpeg to pkgconfig + +------------------------------------------------------------------- +Mon Jul 25 11:28:39 UTC 2016 - [email protected] + +- Build with ffmpeg unconditionally + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3.spec ++++++ --- /var/tmp/diff_new_pack.x4q2oi/_old 2016-08-05 18:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.x4q2oi/_new 2016-08-05 18:16:34.000000000 +0200 @@ -16,6 +16,8 @@ # +%bcond_without ffmpeg + Name: kid3 Version: 3.4.1 Release: 0 @@ -38,16 +40,14 @@ # kid3 and kid3-qt can exist together on a system but the user will have two packages with the same functionality. Conflicts: kid3-qt = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?BUILD_ORIG} -BuildRequires: libchromaprint-devel-with-ffmpeg +%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswresample) -%else -BuildRequires: libchromaprint-devel %endif +BuildRequires: pkgconfig(libchromaprint) %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 BuildRequires: docbook-xsl-stylesheets BuildRequires: kdoctools-devel @@ -63,11 +63,6 @@ BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavresample) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libswresample) %else BuildRequires: libkde4-devel BuildRequires: libqt4-devel >= 4.7 @@ -212,7 +207,7 @@ # NOTE: plugin QML is set to off because build currently failes, patches are welcome. options+="-DCMAKE_SKIP_RPATH=ON -DWITH_LIBDIR:STRING=%{_lib}/kid3 -DWITH_PLUGINSDIR:STRING=%{_lib}/kid3/plugins " options+="-DWITH_QML:BOOL=OFF -DWITH_GSTREAMER=ON -DWITH_DOCDIR=share/doc/packages/kid3-qt " -%if 0%{?BUILD_ORIG} +%if %{with ffmpeg} options+="-DWITH_CHROMAPRINT_FFMPEG:BOOL=ON -DWITH_FFMPEG:BOOL=ON" %endif %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
