rpms/kid3/devel kid3-0.10-docdir.patch, NONE, 1.1 kid3.spec, 1.19, 1.20

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25260

Modified Files:
	kid3.spec 
Added Files:
	kid3-0.10-docdir.patch 
Log Message:
Fix KDE4 build

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: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kid3.spec	2 Dec 2007 21:25:19 -0000	1.19
+++ kid3.spec	2 Dec 2007 22:36:31 -0000	1.20
@@ -4,19 +4,21 @@
 
 Name:           kid3
 Version:        0.10
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.10-docdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?kde3}
 BuildRequires:  kdelibs3-devel
 %else
 BuildRequires:  kdelibs4-devel
+BuildRequires:  cmake
 %endif
 BuildRequires:  id3lib-devel
 BuildRequires:  taglib-devel >= 1.4
@@ -37,14 +39,17 @@
 
 %prep
 %setup -q
+%patch0 -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
-%endif
 %configure --disable-rpath --disable-dependency-tracking
+%else
+%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
+%endif
 make %{?_smp_mflags}
 
 
@@ -53,8 +58,9 @@
 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*
+rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/index.{cache.bz2,docbook} # KDE4
 %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
@@ -81,9 +87,13 @@
 %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*