[kid3] Update to 3.0.
Ville Skyttä
scop at fedoraproject.org
Fri Oct 25 19:06:51 UTC 2013
commit f354d0b683925b32495d66be6c91046ce10158a3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Oct 25 22:06:53 2013 +0300
Update to 3.0.
...-precision-loss-in-Taglib-XM-support-test.patch | 25 ------
0001-Honor-LIB_SUFFIX-if-set.patch | 27 ++++++
kid3-3.0-readline.patch | 22 +++++
kid3.spec | 90 ++++++++++++--------
sources | 2 +-
5 files changed, 106 insertions(+), 60 deletions(-)
---
diff --git a/0001-Honor-LIB_SUFFIX-if-set.patch b/0001-Honor-LIB_SUFFIX-if-set.patch
new file mode 100644
index 0000000..b8b0be2
--- /dev/null
+++ b/0001-Honor-LIB_SUFFIX-if-set.patch
@@ -0,0 +1,27 @@
+From b7c2bdc93a838a3980ddf72a6bb445e4839f1570 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Fri, 25 Oct 2013 20:34:43 +0300
+Subject: [PATCH] Honor LIB_SUFFIX if set.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8039580..5d0a383 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,8 +110,8 @@ else (APPLE)
+ set(WITH_TRANSLATIONSDIR_DEFAULT "share/kid3-qt/translations")
+ endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS)
+ set(WITH_BINDIR_DEFAULT "bin")
+- set(WITH_LIBDIR_DEFAULT "lib/kid3")
+- set(WITH_PLUGINSDIR_DEFAULT "lib/kid3/plugins")
++ set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
++ set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins")
+ endif (APPLE)
+
+ set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING
+--
+1.8.3.1
+
diff --git a/kid3-3.0-readline.patch b/kid3-3.0-readline.patch
new file mode 100644
index 0000000..0915948
--- /dev/null
+++ b/kid3-3.0-readline.patch
@@ -0,0 +1,22 @@
+diff -up kid3-3.0/src/app/cli/readlinecompleter.cpp~ kid3-3.0/src/app/cli/readlinecompleter.cpp
+--- kid3-3.0/src/app/cli/readlinecompleter.cpp~ 2013-10-19 23:29:53.000000000 +0300
++++ kid3-3.0/src/app/cli/readlinecompleter.cpp 2013-10-24 00:25:42.187370552 +0300
+@@ -26,6 +26,7 @@
+
+ #include "readlinecompleter.h"
+
++#include <cstdio>
+ #include <readline/readline.h>
+ #include <cstdlib>
+
+diff -up kid3-3.0/src/app/cli/standardinputreader.cpp~ kid3-3.0/src/app/cli/standardinputreader.cpp
+--- kid3-3.0/src/app/cli/standardinputreader.cpp~ 2013-10-19 23:29:53.000000000 +0300
++++ kid3-3.0/src/app/cli/standardinputreader.cpp 2013-10-24 00:24:01.290311950 +0300
+@@ -27,6 +27,7 @@
+ #include "standardinputreader.h"
+ #include "cliconfig.h"
+ #ifdef HAVE_READLINE
++#include <cstdio>
+ #include <readline/readline.h>
+ #include <readline/history.h>
+ #if RL_READLINE_VERSION < 0x0600
diff --git a/kid3.spec b/kid3.spec
index 60e6f75..e553527 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,13 +1,17 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: kid3
-Version: 2.3
-Release: 2%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: Efficient KDE ID3 tag editor
License: GPLv2+
URL: http://kid3.sourceforge.net/
Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-# Sent upstream 2013-03-15
-Patch0: 0001-Fix-precision-loss-in-Taglib-XM-support-test.patch
+# http://sourceforge.net/p/kid3/code/ci/5b1f26a
+Patch0: %{name}-3.0-readline.patch
+# Sent upstream 2013-10-25
+Patch1: 0001-Honor-LIB_SUFFIX-if-set.patch
BuildRequires: kdelibs4-devel
BuildRequires: cmake
@@ -16,9 +20,12 @@ BuildRequires: taglib-devel >= 1.4
BuildRequires: flac-devel
BuildRequires: libvorbis-devel
BuildRequires: libchromaprint-devel
+# gstreamer 0.10 vs 1: https://sourceforge.net/p/kid3/bugs/77/
BuildRequires: gstreamer-devel
+BuildConflicts: gstreamer1-devel
+BuildRequires: readline-devel
BuildRequires: gettext
-Requires: xdg-utils
+Requires: %{name}-common = %{version}-%{release}
%description
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@@ -27,10 +34,24 @@ MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, and AIFF files
and have control over both ID3v1 and ID3v2 tags, then Kid3 is the
program you are looking for.
+%package common
+Summary: Efficient command line ID3 tag editor
+Group: Applications/Multimedia
+Requires: xdg-utils
+
+%description common
+If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
+MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, and AIFF files
+(e.g. full albums) without typing the same information again and again
+and have control over both ID3v1 and ID3v2 tags, then Kid3 is the
+program you are looking for. The %{name}-common package provides Kid3
+command line tool and files shared between all Kid3 variants.
+
+
%package qt
Summary: Efficient Qt ID3 tag editor
Group: Applications/Multimedia
-Requires: xdg-utils
+Requires: %{name}-common = %{version}-%{release}
%description qt
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@@ -44,39 +65,33 @@ built without KDE dependencies.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-# -DBUILD_SHARED_LIBS:BOOL=OFF:
-# http://sf.net/tracker/?func=detail&aid=3405853&group_id=70849&atid=529221
-opts="-DBUILD_SHARED_LIBS:BOOL=OFF"
-
-mkdir _kid3 ; cd _kid3
-%cmake_kde4 $opts ..
-make %{?_smp_mflags}
-cd ..
-
-mkdir _kid3-qt ; cd _kid3-qt
-%cmake $opts -DWITH_KDE:BOOL=OFF \
- -DWITH_DOCDIR=share/doc/%{name}-qt%{!?_docdir_fmt:-%{version}} ..
+%cmake_kde4 -DWITH_DOCDIR=share/doc/%{name}-qt%{!?_docdir_fmt:-%{version}} .
make %{?_smp_mflags}
-cd ..
%install
-make -C _kid3 install DESTDIR=$RPM_BUILD_ROOT
-make -C _kid3-qt install DESTDIR=$RPM_BUILD_ROOT
-
-install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
-install -pm 644 deb/kid3{,-qt}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name} --with-kde --with-qt
-grep -vF kid3-qt %{name}.lang > %{name}-kde.lang
-grep -F kid3-qt %{name}.lang > %{name}-qt.lang
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}{,/de}/man1
+install -pm 644 deb/kid3{,-cli,-qt}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -pm 644 deb/kid3*.de.1 $RPM_BUILD_ROOT%{_mandir}/de/man1/
+rename .de. . $RPM_BUILD_ROOT%{_mandir}/de/man1/*.1
+install -dm 755 $RPM_BUILD_ROOT%{_pkgdocdir}
install -pm 644 AUTHORS ChangeLog COPYING LICENSE README \
- $RPM_BUILD_ROOT%{_docdir}/%{name}-qt%{!?_docdir_fmt:-%{version}}
+ $RPM_BUILD_ROOT%{_pkgdocdir}
+
+%find_lang %{name} --with-kde --with-man
+mv %{name}.lang %{name}-kde.lang
+%find_lang %{name}-qt --with-man
+%find_lang %{name} --with-qt
+cat %{name}.lang >> %{name}-qt.lang
+%find_lang %{name}-cli --with-man
%post -p <lua>
@@ -109,28 +124,35 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}-kde.lang
-%doc AUTHORS ChangeLog COPYING LICENSE README
%{_bindir}/kid3
%{_datadir}/applications/kde4/kid3.desktop
%{_datadir}/icons/hicolor/*x*/apps/kid3.png
%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
-%{_datadir}/dbus-1/interfaces/*.xml
%{_kde4_appsdir}/kid3/
%{_mandir}/man1/kid3.1*
+%files common -f %{name}-cli.lang
+%{_bindir}/kid3-cli
+%{_libdir}/kid3/
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_mandir}/man1/kid3-cli.1*
+%{_pkgdocdir}/
+
%files qt -f %{name}-qt.lang
-%doc %{_docdir}/%{name}-qt%{!?_docdir_fmt:-%{version}}/
%{_bindir}/kid3-qt
%{_datadir}/applications/kid3-qt.desktop
%{_datadir}/icons/hicolor/*x*/apps/kid3-qt.png
%{_datadir}/icons/hicolor/scalable/apps/kid3-qt.svg
-%{_datadir}/dbus-1/interfaces/*.xml
-%dir %{_datadir}/kid3-qt/
-%dir %{_datadir}/kid3-qt/translations/
+%dir %{_docdir}/kid3-qt%{!?_docdir_fmt:-%{version}}/
+%lang(de) %{_docdir}/kid3-qt%{!?_docdir_fmt:-%{version}}/kid3_de.html
+%lang(en) %{_docdir}/kid3-qt%{!?_docdir_fmt:-%{version}}/kid3_en.html
%{_mandir}/man1/kid3-qt.1*
%changelog
+* Fri Oct 25 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.0-1
+- Update to 3.0.
+
* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.3-2
- Install -qt docs to unversioned dir if %%{_docdir_fmt} is defined.
diff --git a/sources b/sources
index a641b40..ff55fb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea78a5a1346b6c7a9cfab91a60feeb63 kid3-2.3.tar.gz
+9efc2d14ea6217d7e543b1fe79c13815 kid3-3.0.tar.gz
More information about the scm-commits
mailing list