Hello community, here is the log from the commit of package kid3 for openSUSE:Factory checked in at 2016-08-29 15:38:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-09 22:15:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kid3.new/kid3.changes 2016-08-29 15:41:52.000000000 +0200 @@ -1,0 +2,43 @@ +Thu Aug 25 12:47:23 UTC 2016 - [email protected] + +- update to version 3.4.2 + * Fixed: + + Embed Lyrics works again with makepersonal.co and + lyrics.wikia.com. + + Do not add an empty frame when deleting a non existant frame + in kid3-cli. + + Support setting multiple frames of the same type with + copy/paste. + + Allow editing of quick access frames which are not yet present + in the file. + + Reset shortcuts and appearance configuration when the defaults + are restored in the settings. + * Improved: + + Do not show any disabled tag values in the Tag 1 section + for files which do not support an ID3v1 tag. + + Set the file filter for the file list in the file settings, + not with the filter used in the open dialog. + + Disable the global app menu on Ubuntu's Unity desktop. +- Removed conditional 'ffmpeg' because the required libraries are + available in OBS. +- Added %bcond 'build_qt5' to build against qt5 for openSUSE > 13.2 + and SLE (inclusive Leap 42.x). +- Added %bcond 'build_kde' to build against kde4/kf5 for all + distributions except SLE 12 (on PMBS kid3 can be successfully + build without KDE frontend). +- Deleted devel files libkid3-*.so because they are not needed and + removed kid3-rpmlintrc. +- Removed unneeded buildrequires libtunepimp-devel and changed some + buildrequires to pkgconfig() and cmake(). +- Add gpg signature as source (file kid3-3.4.2.tar.gz.asc). +- Added buildrequires hicolor-icon-theme, needed by post(un) + srcipts %icon_theme_cache_post(un). +- Small changes in options for cmake, enabled build of QML and + added build/install for SLE 12 (only components QT and CLI). +- Removed manual installation on manpage for kid3 as it's installed + during build process. +- Moved kid3 manpages from package kid3 to package kid3-core, + manpages kid3-cli and kid3-qt are only symlinks and require + manpage kid3. + +------------------------------------------------------------------- Old: ---- kid3-3.4.1.tar.gz kid3-rpmlintrc New: ---- kid3-3.4.2.tar.gz kid3-3.4.2.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kid3.spec ++++++ --- /var/tmp/diff_new_pack.rOoqzN/_old 2016-08-29 15:41:56.000000000 +0200 +++ /var/tmp/diff_new_pack.rOoqzN/_new 2016-08-29 15:41:56.000000000 +0200 @@ -16,43 +16,48 @@ # -%bcond_without ffmpeg +%if 0%{?suse_version} > 1320 || 0%{?sle_version} +%bcond_without build_qt5 +%endif + +%if ! ( 0%{?suse_version} == 1315 && ! 0%{?is_opensuse} ) +%bcond_without build_kde +%endif Name: kid3 -Version: 3.4.1 +Version: 3.4.2 Release: 0 Summary: Efficient ID3 Tag Editor License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Url: http://kid3.sourceforge.net/ # WARNING: The source url is a moving target, leave it blank -Source0: %{name}/%{name}-%{version}.tar.gz -Source99: kid3-rpmlintrc -BuildRequires: flac-devel +Source0: %{name}-%{version}.tar.gz +Source1: %{name}-%{version}.tar.gz.asc BuildRequires: id3lib-devel -BuildRequires: libogg-devel -BuildRequires: libtag-devel >= 1.4 -BuildRequires: libtunepimp-devel -BuildRequires: libvorbis-devel +BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(taglib) >= 1.4 +BuildRequires: pkgconfig(vorbis) BuildRequires: readline-devel +BuildRequires: docbook-xsl-stylesheets 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 %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswresample) -%endif BuildRequires: pkgconfig(libchromaprint) -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -BuildRequires: docbook-xsl-stylesheets -BuildRequires: kdoctools-devel +%if %{with build_qt5} +%if %{with build_kde} BuildRequires: kf5-filesystem -BuildRequires: kio-devel +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5KIO) +%endif BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -76,13 +81,13 @@ BuildRequires: pkgconfig(gstreamer-0.10) %endif %if 0%{?suse_version} +BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files %endif %if 0%{?suse_version} > 1210 Requires: libxslt-tools %endif -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -%else +%if %{without build_qt5} %{kde4_runtime_requires} %endif @@ -174,6 +179,7 @@ This package contains a command line interface for Kid3, for a GUI you can use kid3-qt or kid3. +%if %{with build_kde} %package doc Summary: Documentation for %{name} Group: Productivity/Multimedia/Sound/Utilities @@ -182,6 +188,8 @@ %description doc This package provides documentation and help files for %{name}. +%endif + %package qt-doc Summary: Documentation for %{name}-qt Group: Productivity/Multimedia/Sound/Utilities @@ -204,14 +212,16 @@ %setup -q -n kid3-%{version} %build -# 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 %{with ffmpeg} -options+="-DWITH_CHROMAPRINT_FFMPEG:BOOL=ON -DWITH_FFMPEG:BOOL=ON" +options+="-DCMAKE_SKIP_RPATH=ON -DWITH_LIBDIR=%{_lib}/kid3 -DWITH_PLUGINSDIR=%{_lib}/kid3/plugins " +options+="-DWITH_GSTREAMER=ON -DWITH_DOCDIR=share/doc/packages/kid3-qt " +options+="-DWITH_CHROMAPRINT_FFMPEG=ON -DWITH_FFMPEG=ON" +%if %{with build_qt5} +options+="-DWITH_QT5=1 -DWITH_QMLDIR=%{_lib}/qt5/qml/kid3 " +%if %{without build_kde} +%cmake -DWITH_APPS="Qt;CLI" $options +%else +%cmake_kf5 -d build -- $options %endif -%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 @@ -219,21 +229,24 @@ %make_jobs %install -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%if %{with build_qt5} +%if %{without build_kde} +%cmake_install -C build +%else %kf5_makeinstall -C build +%endif %else %kde4_makeinstall -C build %endif -install -Dpm 0644 deb/kid3.1 %{buildroot}%{_mandir}/man1/kid3.1 +%if %{with build_kde} pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ gzip -dS .svgz kid3.svgz mv kid3 kid3.svg popd +%endif -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -# Do nothing -%else +%if %{without build_qt5} %kde_post_install %endif @@ -244,14 +257,35 @@ %{_libdir}/kid3 EOF +rm %{buildroot}%{_libdir}/kid3/libkid3-*.so + +%if %{with build_kde} +%post +%desktop_database_post +%icon_theme_cache_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%endif + +%post qt +%desktop_database_post +%icon_theme_cache_post + +%postun qt +%desktop_database_postun +%icon_theme_cache_postun + %post core -p /sbin/ldconfig %postun core -p /sbin/ldconfig +%if %{with build_kde} %files %defattr(-,root,root,-) %dir %{_datadir}/appdata -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%if %{with build_qt5} %{_kf5_bindir}/kid3 %{_kf5_iconsdir}/hicolor/*/apps/kid3.* %{_kf5_kxmlguidir}/kid3/ @@ -263,8 +297,7 @@ %{_kde4_iconsdir}/hicolor/*/apps/kid3.* %endif %{_datadir}/appdata/kid3.appdata.xml -%{_mandir}/man1/kid3.1%{ext_man} -%{_mandir}/de/man1/kid3.1%{ext_man} +%endif %files qt %defattr(-,root,root,-) @@ -286,18 +319,29 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING LICENSE README kid3.lsm %{_libdir}/kid3/ +%if %{with build_qt5} +%{_libdir}/qt5/qml/kid3/ +%else +%{_datadir}/kid3/qml/ +%endif %config %{_sysconfdir}/ld.so.conf.d/kid3.conf -%{_datadir}/dbus-1/interfaces/*.xml +%if %{with build_kde} +%{_datadir}/dbus-1/interfaces/net.sourceforge.Kid3.xml +%endif +%{_mandir}/man1/kid3.1%{ext_man} +%{_mandir}/de/man1/kid3.1%{ext_man} +%if %{with build_kde} %files doc %defattr(-,root,root,-) -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +%if %{with build_qt5} %doc %{_kf5_htmldir}/de/kid3/ %doc %{_kf5_htmldir}/en/kid3/ %else %doc %{_kde4_htmldir}/de/kid3/ %doc %{_kde4_htmldir}/en/kid3/ %endif +%endif %files qt-doc %defattr(-,root,root,-) ++++++ kid3-3.4.1.tar.gz -> kid3-3.4.2.tar.gz ++++++ ++++ 1636 lines of diff (skipped)
