rpms/kid3/F-8 kid3-0.10-defaultbrowser.patch, NONE, 1.1 kid3-0.10-docdir.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kid3.spec, 1.17, 1.18 sources, 1.7, 1.8 kid3-0.9-desktop.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Dec 3 22:00:47 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/kid3/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29936
Modified Files:
.cvsignore kid3.spec sources
Added Files:
kid3-0.10-defaultbrowser.patch kid3-0.10-docdir.patch
Removed Files:
kid3-0.9-desktop.patch
Log Message:
* Mon Dec 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-2
- Use xdg-open as the default browser.
* Sun Dec 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-1
- 0.10, desktop entry patch applied upstream.
- Build for KDE4 in F9+, KDE3 in earlier.
* Sun Dec 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9-3
- BuildRequire libvorbis-devel, and kdelibs3-devel instead of kdelibs-devel.
kid3-0.10-defaultbrowser.patch:
--- NEW FILE kid3-0.10-defaultbrowser.patch ---
diff -up kid3-0.10/kid3/miscconfig.cpp~ kid3-0.10/kid3/miscconfig.cpp
--- kid3-0.10/kid3/miscconfig.cpp~ 2007-11-11 23:45:50.000000000 +0200
+++ kid3-0.10/kid3/miscconfig.cpp 2007-12-03 01:21:01.000000000 +0200
@@ -45,12 +45,7 @@
const char* const MiscConfig::s_defaultCommentName = "COMMENT";
/** Default value for web browser */
-const char* const MiscConfig::s_defaultBrowser =
-#ifdef CONFIG_USE_KDE
- "konqueror";
-#else
- "firefox";
-#endif
+const char* const MiscConfig::s_defaultBrowser = "xdg-open";
/** Default filename format list */
static const char* fnFmt[] = {
kid3-0.10-docdir.patch:
--- NEW FILE kid3-0.10-docdir.patch ---
diff -up kid3-0.10/doc/en/CMakeLists.txt~ kid3-0.10/doc/en/CMakeLists.txt
--- kid3-0.10/doc/en/CMakeLists.txt~ 2007-10-16 20:35:22.000000000 +0300
+++ kid3-0.10/doc/en/CMakeLists.txt 2007-12-03 00:31:48.000000000 +0200
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kid3)
diff -up kid3-0.10/doc/de/CMakeLists.txt~ kid3-0.10/doc/de/CMakeLists.txt
--- kid3-0.10/doc/de/CMakeLists.txt~ 2007-10-16 20:35:22.000000000 +0300
+++ kid3-0.10/doc/de/CMakeLists.txt 2007-12-03 00:31:55.000000000 +0200
@@ -1 +1 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR})
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/de SUBDIR kid3)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 14 Jun 2007 15:45:59 -0000 1.7
+++ .cvsignore 3 Dec 2007 22:00:13 -0000 1.8
@@ -1 +1 @@
-kid3-0.9.tar.gz
+kid3-0.10.tar.gz
Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/F-8/kid3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kid3.spec 17 Aug 2007 09:14:33 -0000 1.17
+++ kid3.spec 3 Dec 2007 22:00:13 -0000 1.18
@@ -1,40 +1,58 @@
+%if 0%{?fedora} < 9
+%global kde3 1
+%endif
+
Name: kid3
-Version: 0.9
+Version: 0.10
Release: 2%{?dist}
Summary: Efficient ID3 tag editor
Group: Applications/Multimedia
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1775310&group_id=70849&atid=529221
License: GPLv2+
URL: http://kid3.sourceforge.net/
Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0: %{name}-0.9-desktop.patch
+Patch0: %{name}-0.10-docdir.patch
+Patch1: %{name}-0.10-defaultbrowser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdelibs-devel
+%if 0%{?kde3}
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: kdelibs4-devel
+BuildRequires: cmake
+%endif
BuildRequires: id3lib-devel
BuildRequires: taglib-devel >= 1.4
BuildRequires: flac-devel
BuildRequires: libtunepimp-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libmp4v2-devel
BuildRequires: perl(File::Spec)
BuildRequires: gettext
+Requires: xdg-utils
%description
-If you want to easily tag multiple MP3, Ogg/Vorbis or FLAC 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.
+If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
+MP4/AAC, MP2, Speex, TrueAudio and WavPack 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.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths
%build
+%if 0%{?kde3}
unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
%configure --disable-rpath --disable-dependency-tracking
+%else
+%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
+%endif
make %{?_smp_mflags}
@@ -43,8 +61,8 @@
make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
# preserve desktop entry location for from < 0.8 upgrades
-mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
-rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
%find_lang %{name}
abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -71,15 +89,29 @@
%doc AUTHORS ChangeLog COPYING LICENSE README
%{_bindir}/kid3
%{_datadir}/applications/*kid3.desktop
-%{_datadir}/apps/kid3/
%{_datadir}/icons/hicolor/*x*/apps/kid3.png
%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%if 0%{?kde3}
+%{_datadir}/apps/kid3/
+%else
+%{_datadir}/kde4/apps/kid3/
+%endif
%lang(en) %{_docdir}/HTML/en/kid3/
%lang(de) %{_docdir}/HTML/de/
%{_mandir}/man1/kid3.1*
%changelog
+* Mon Dec 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-2
+- Use xdg-open as the default browser.
+
+* Sun Dec 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-1
+- 0.10, desktop entry patch applied upstream.
+- Build for KDE4 in F9+, KDE3 in earlier.
+
+* Sun Dec 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9-3
+- BuildRequire libvorbis-devel, and kdelibs3-devel instead of kdelibs-devel.
+
* Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9-2
- Remove Application Category and deprecated items from desktop entry.
- License: GPLv2+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 14 Jun 2007 15:45:59 -0000 1.7
+++ sources 3 Dec 2007 22:00:13 -0000 1.8
@@ -1 +1 @@
-b332c00a0bf7926085f102fe2ca115a1 kid3-0.9.tar.gz
+7333a1f12249467aa1233b374128a8d9 kid3-0.10.tar.gz
--- kid3-0.9-desktop.patch DELETED ---
More information about the scm-commits
mailing list