Hello community, here is the log from the commit of package kid3 for openSUSE:Factory checked in at 2015-12-24 12:17:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-18 21:54:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kid3.new/kid3.changes 2015-12-24 12:17:39.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 23 15:13:27 UTC 2015 - [email protected] + +- Added conditional for kf5 to build in openSUSE:Leap:42.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3.spec ++++++ --- /var/tmp/diff_new_pack.V2DcsU/_old 2015-12-24 12:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.V2DcsU/_new 2015-12-24 12:17:40.000000000 +0100 @@ -27,13 +27,23 @@ Source99: kid3-rpmlintrc BuildRequires: flac-devel BuildRequires: id3lib-devel +BuildRequires: libogg-devel +BuildRequires: libtag-devel >= 1.4 +BuildRequires: libtunepimp-devel +BuildRequires: libvorbis-devel +BuildRequires: readline-devel +Requires: %{name}-core = %{version} +Requires: xdg-utils +# 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: ffmpeg-devel BuildRequires: libchromaprint-devel-with-ffmpeg %else BuildRequires: libchromaprint-devel %endif -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 BuildRequires: docbook-xsl-stylesheets BuildRequires: kdoctools-devel BuildRequires: kf5-filesystem @@ -52,33 +62,23 @@ BuildRequires: libkde4-devel BuildRequires: libqt4-devel >= 4.7 %endif -BuildRequires: libogg-devel -BuildRequires: libtunepimp-devel -BuildRequires: libvorbis-devel %if 0%{?suse_version} > 1210 BuildRequires: libxslt-tools %endif -BuildRequires: libtag-devel >= 1.4 -BuildRequires: readline-devel %if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(gstreamer-1.0) %else BuildRequires: pkgconfig(gstreamer-0.10) %endif - %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -Requires: %{name}-core = %{version} -Requires: xdg-utils %if 0%{?suse_version} > 1210 Requires: libxslt-tools %endif -# 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%{?suse_version} <= 1320 -%kde4_runtime_requires +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%else +%{kde4_runtime_requires} %endif %description @@ -107,10 +107,10 @@ Summary: Efficient ID3 Tag Editor Group: Productivity/Multimedia/Sound/Utilities Requires: %{name}-core = %{version} +Requires: xdg-utils # kid3 and kid3-qt can exist together on a system but the user will have two packages with the same functionality. Conflicts: kid3 = %{version} Obsoletes: kid3-qt < %{version} -Requires: xdg-utils %description qt With Kid3 you can: @@ -197,8 +197,8 @@ %if 0%{?BUILD_ORIG} options+="-DWITH_CHROMAPRINT_FFMPEG:BOOL=ON -DWITH_FFMPEG:BOOL=ON" %endif -%if 0%{?suse_version} > 1320 -%cmake_kf5 -d build -- $options +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%cmake_kf5 -d build -- $options -DWITH_QT5:BOOL=1 %else %cmake_kde4 -d build -- $options %endif @@ -206,7 +206,7 @@ %make_jobs %install -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 %kf5_makeinstall -C build %else %kde4_makeinstall -C build @@ -218,7 +218,9 @@ mv kid3 kid3.svg popd -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +# Do nothing +%else %kde_post_install %endif @@ -233,22 +235,19 @@ %postun core -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %dir %{_datadir}/appdata -%if 0%{?suse_version} <= 1320 -%{_kde4_applicationsdir}/kid3.desktop -%{_kde4_appsdir}/kid3/ -%{_kde4_bindir}/kid3 -%{_kde4_iconsdir}/hicolor/*/apps/kid3.* -%else +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 %{_kf5_bindir}/kid3 %{_kf5_iconsdir}/hicolor/*/apps/kid3.* %{_kf5_kxmlguidir}/kid3/ %{_kf5_applicationsdir}/kid3.desktop +%else +%{_kde4_applicationsdir}/kid3.desktop +%{_kde4_appsdir}/kid3/ +%{_kde4_bindir}/kid3 +%{_kde4_iconsdir}/hicolor/*/apps/kid3.* %endif %{_datadir}/appdata/kid3.appdata.xml %{_mandir}/man1/kid3.1%{ext_man} @@ -279,12 +278,12 @@ %files doc %defattr(-,root,root,-) -%if 0%{?suse_version} <= 1320 -%doc %{_kde4_htmldir}/de/kid3/ -%doc %{_kde4_htmldir}/en/kid3/ -%else +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 %doc %{_kf5_htmldir}/de/kid3/ %doc %{_kf5_htmldir}/en/kid3/ +%else +%doc %{_kde4_htmldir}/de/kid3/ +%doc %{_kde4_htmldir}/en/kid3/ %endif %files qt-doc
