Hello community,

here is the log from the commit of package kid3 for openSUSE:Factory checked in 
at 2015-06-15 17:49:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-29 
09:57:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kid3.new/kid3.changes   2015-06-15 
17:49:27.000000000 +0200
@@ -1,0 +2,51 @@
+Wed Jun 10 14:42:48 UTC 2015 - [email protected]
+
+- Combine the kid3 and kid3-kf5 packages in a single spec-file and 
+  build the KF5 based version for openSUSE > 13.2
+
+-------------------------------------------------------------------
+Sat Apr 18 05:13:45 UTC 2015 - [email protected]
+
+- Renamed kf5-kid3 to kid3-kf5
+
+-------------------------------------------------------------------
+Mon Mar 30 08:50:33 UTC 2015 - [email protected]
+
+- Added conflict of kid3-core and kf5-kid3-core to kf5-kid3.spec
+
+-------------------------------------------------------------------
+Fri Mar 20 22:22:29 UTC 2015 - [email protected]
+
+- Created package kf5-kid3
+
+-------------------------------------------------------------------
+Wed Mar 18 20:08:10 UTC 2015 - [email protected]
+
+- update to version 3.2.0
+  * New:
+    + Support QML/JS scripts for user actions.
+    + Batch embed, export, and resize album art.
+    + Batch lyrics download.
+    + Recursive tag export.
+    + Support build with KDE 5.
+    + Support DSF files with TagLib 1.9.1.
+    + Option to mark pictures larger than a given size.
+    + Number tracks can reset track number for each folder.
+    + Number tracks can only format numbers or set total.
+    + Only expand subtree if shift is pressed with "Expand all".
+    + Support Ogg FLAC files.
+    + QML plugin.
+  * Improved:
+    + File suffix for export (e.g. picture) is determined by mime type.
+    + Image dimensions are displayed below picture.
+  * Fixed:
+    + Crash when TagLib file is saved with changes in tags and file name.
+    + Deletion of picture frames from Ogg/Opus files.
+    + Setting description of Ogg pictures in frame table.
+    + Reactivate support for AAC and MP2 files with TagLib.
+    + Mac OS X: Avoid excessive memory consumption.
+    + Adapted to Discogs server update.
+    + Adapted to Amazon server update.
+  - Added file kid3-rpmlintrc to suppress error messages.
+
+-------------------------------------------------------------------

Old:
----
  kid3-3.1.2.tar.gz

New:
----
  kid3-3.2.0.tar.gz
  kid3-rpmlintrc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kid3.spec ++++++
--- /var/tmp/diff_new_pack.Upydgx/_old  2015-06-15 17:49:28.000000000 +0200
+++ /var/tmp/diff_new_pack.Upydgx/_new  2015-06-15 17:49:28.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kid3
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,55 @@
 
 
 Name:           kid3
-Version:        3.1.2
+Version:        3.2.0
 Release:        0
 Summary:        Efficient ID3 Tag Editor
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://kid3.sourceforge.net/
 Source0:        
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source99:       kid3-rpmlintrc
 BuildRequires:  flac-devel
 BuildRequires:  id3lib-devel
+%if 0%{?BUILD_ORIG}
+BuildRequires:  libchromaprint-devel-with-ffmpeg
+BuildRequires:  libffmpeg-devel
+%else
 BuildRequires:  libchromaprint-devel
+%endif
+%if 0%{?suse_version} > 1320
+BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  kdoctools-devel
+BuildRequires:  kf5-filesystem
+BuildRequires:  kio-devel
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5UiTools)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
+%else
 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
-BuildRequires:  taglib-devel >= 1.4
 %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
@@ -49,12 +74,12 @@
 %if 0%{?suse_version} > 1210
 Requires:       libxslt-tools
 %endif
-Recommends:     %{name}-lang = %{version}
 # 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}
-Conflicts:      kid3-qt4 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} <= 1320
 %kde4_runtime_requires
+%endif
 
 %description
 With Kid3 you can:
@@ -84,7 +109,6 @@
 Requires:       %{name}-core = %{version}
 # kid3 and kid3-qt can exist together on a system but the user will have two 
packages with the same functionality.
 Conflicts:      kid3 = %{version}
-Provides:       kid3-qt = %{version}
 Obsoletes:      kid3-qt < %{version}
 Requires:       xdg-utils
 
@@ -153,65 +177,52 @@
 %description qt-doc
 This package provides documentation and help files for %{name}-qt.
 
-%package qt-lang
-Summary:        Efficient ID3 Tag Editor
-Group:          Productivity/Multimedia/Sound/Utilities
-Requires:       %{name}-qt = %{version}
-
-%description qt-lang
-With Kid3 you can:
-  - Edit ID3v1.1 tags
-  - Edit all ID3v2.3 and ID3v2.4 frames
-  - Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
-  - Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, APE, MP4/AAC, MP2, Speex,
-    TrueAudio, WavPack, WMA, WAV, AIFF files and tracker modules (MOD,
-    S3M, IT, XM).
-  - Edit tags of multiple files, e.g. the artist, album, year and genre
-    of all files of an album typically have the same values and can be
-    set together.
-  - Generate tags from filenames
-  - Generate tags from the contents of tag fields
-  - Generate filenames from tags
-  - Generate playlist files
-  - Automatic case conversion and string translation
-  - Import and export album data
-  - Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon
-
-This package does not use KDE libraries, if you use KDE you should use kid3.
-For a commandline interface you can use kid3-cli.
-
 %package  core
 Summary:        Efficient ID3 Tag Editor: Libraries and Data
 Group:          Productivity/Multimedia/Sound/Utilities
+Recommends:     kid3-trans-lang = %{version}
 
 %description  core
 This package contains common libraries and data files used by kid3, kid3-qt, 
and kid3-cli.
 
-%lang_package
+%lang_package -n %{name}-core
 
 %prep
 %setup -q -n kid3-%{version}
 
 %build
-%cmake_kde4 -d build -- -DWITH_GSTREAMER=ON -DCMAKE_BUILD_TYPE=Release 
-DWITH_APPS="Qt;CLI;KDE" -DWITH_DOCDIR="share/doc/packages/kid3-qt"
+# 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}
+options+="-DWITH_CHROMAPRINT_FFMPEG:BOOL=ON -DWITH_FFMPEG:BOOL=ON"
+%endif
+%if 0%{?suse_version} > 1320
+%cmake_kf5 -d build -- $options
+%else
+%cmake_kde4 -d build -- $options
+%endif
+
 %make_jobs
 
 %install
-pushd build
-%kde4_makeinstall
-popd
-
+%if 0%{?suse_version} > 1320
+%kf5_makeinstall -C build
+%else
+%kde4_makeinstall -C build
+%endif
 install -Dpm 0644 deb/kid3.1 %{buildroot}%{_mandir}/man1/kid3.1
 
-pushd %{buildroot}%{_kde4_iconsdir}/hicolor/scalable/apps/
+pushd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 gzip -dS .svgz kid3.svgz
 mv kid3 kid3.svg
 popd
 
+%if 0%{?suse_version} <= 1320
 %kde_post_install
+%endif
 
-%find_lang %{name}
-%find_lang %{name} %{name}-qt.lang --without-kde --with-qt --all-name 
--without-mo
+%find_lang %{name} %{name}-core.lang --without-kde --with-qt --all-name 
--without-mo
 
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 cat <<EOF >%{buildroot}%{_sysconfdir}/ld.so.conf.d/kid3.conf
@@ -228,11 +239,20 @@
 %files
 %defattr(-,root,root,-)
 %dir %{_datadir}/appdata
+%if 0%{?suse_version} <= 1320
 %{_kde4_applicationsdir}/kid3.desktop
-%{_datadir}/appdata/kid3.appdata.xml
 %{_kde4_appsdir}/kid3/
 %{_kde4_bindir}/kid3
 %{_kde4_iconsdir}/hicolor/*/apps/kid3.*
+%else
+%{_kf5_bindir}/kid3
+%{_kf5_iconsdir}/hicolor/*/apps/kid3.*
+%{_kf5_kxmlguidir}/kid3/
+%{_kf5_applicationsdir}/kid3.desktop
+%endif
+%{_datadir}/appdata/kid3.appdata.xml
+%{_mandir}/man1/kid3.1%{ext_man}
+%{_mandir}/de/man1/kid3.1%{ext_man}
 
 %files qt
 %defattr(-,root,root,-)
@@ -240,7 +260,7 @@
 %{_datadir}/applications/kid3-qt.desktop
 %{_datadir}/appdata/kid3-qt.appdata.xml
 %{_bindir}/kid3-qt
-%{_kde4_iconsdir}/hicolor/*/apps/kid3-qt.*
+%{_datadir}/icons/hicolor/*/apps/kid3-qt.*
 %{_mandir}/man1/kid3-qt.1%{ext_man}
 %{_mandir}/de/man1/kid3-qt.1%{ext_man}
 
@@ -254,27 +274,31 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING LICENSE README kid3.lsm
 %{_libdir}/kid3/
-%{_sysconfdir}/ld.so.conf.d/kid3.conf
+%config %{_sysconfdir}/ld.so.conf.d/kid3.conf
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_mandir}/man1/kid3.1%{ext_man}
-%{_mandir}/de/man1/kid3.1%{ext_man}
 
 %files doc
 %defattr(-,root,root,-)
+%if 0%{?suse_version} <= 1320
+%doc %{_kde4_htmldir}/de/kid3/
 %doc %{_kde4_htmldir}/en/kid3/
+%else
+%doc %{_kf5_htmldir}/de/kid3/
+%doc %{_kf5_htmldir}/en/kid3/
+%endif
 
 %files qt-doc
 %defattr(-,root,root,-)
 %{_docdir}/kid3-qt/
 
-%files lang -f %{name}.lang
+%files -n %{name}-core-lang -f %{name}-core.lang
 %defattr(-,root,root,-)
-%exclude %{_kde4_htmldir}/en/kid3/
-
-%files lang -f %{name}-qt.lang
-%defattr(-,root,root,-)
-%exclude %{_kde4_htmldir}/en/kid3/
-%dir %{_datadir}/kid3/
-%dir %{_datadir}/kid3/translations/
+%dir %{_datadir}/kid3
+%dir %{_datadir}/kid3/translations
+%if 0%{?suse_version} < 1230
+%{_datadir}/kid3/translations/[email protected]
+%{_datadir}/kid3/translations/[email protected]
+%{_datadir}/kid3/translations/[email protected]
+%endif
 
 %changelog

++++++ kid3-3.1.2.tar.gz -> kid3-3.2.0.tar.gz ++++++
++++ 46781 lines of diff (skipped)

++++++ kid3-rpmlintrc ++++++
# This line is mandatory to access the configuration functions
from Config import *

addFilter("devel-file-in-non-devel-package")

Reply via email to