rpms/kid3/devel kid3-1.4-desktop.patch, NONE, 1.1 kid3-1.4-docbook42.patch, NONE, 1.1 kid3.spec, 1.32, 1.33

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv450

Modified Files:
	kid3.spec 
Added Files:
	kid3-1.4-desktop.patch kid3-1.4-docbook42.patch 
Log Message:
* Mon May 31 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.4-2
- Patch to fix build with KDE 4.5 (DocBook 4.2).
- Patch to improve desktop entry (MIME types, startup).


kid3-1.4-desktop.patch:
 kid3.desktop |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE kid3-1.4-desktop.patch ---
http://sourceforge.net/tracker/?func=detail&aid=2984989&group_id=70849&atid=529223

diff -up kid3-1.4/kid3/kid3.desktop~ kid3-1.4/kid3/kid3.desktop
--- kid3-1.4/kid3/kid3.desktop~	2010-02-20 15:45:31.000000000 +0200
+++ kid3-1.4/kid3/kid3.desktop	2010-04-10 00:27:01.000000000 +0300
@@ -4,7 +4,7 @@ Exec=kid3 %f
 Icon=kid3
 Type=Application
 X-DocPath=kid3/index.html
-MimeType=audio/mpeg;application/ogg;audio/x-flac;audio/x-flac+ogg;audio/x-vorbis+ogg;audio/x-speex+ogg;audio/x-oggflac;audio/x-musepack;audio/aac;audio/mp4;audio/x-speex;audio/x-tta;audio/x-wavpack;x-directory/normal;inode/directory;
+MimeType=audio/mpeg;audio/ogg;application/ogg;audio/x-flac;audio/x-flac+ogg;audio/x-vorbis+ogg;audio/x-speex+ogg;audio/x-oggflac;audio/x-musepack;audio/aac;audio/mp4;audio/x-speex;audio/x-tta;audio/x-wavpack;inode/directory;
 GenericName=Audio Tagger
 GenericName[de]=Audio Tag Editor
 GenericName[es]=Editor de etiquetas de audio
@@ -16,3 +16,5 @@ GenericName[pl]=Edytor znaczników audio
 GenericName[ru]=Программа-редактор аудио-тегов
 Terminal=false
 Categories=Qt;KDE;AudioVideo;Audio;AudioVideoEditing;
+StartupNotify=true
+StartupWMClass=kid3

 	  	 

kid3-1.4-docbook42.patch:
 de/index.docbook |    2 +-
 en/index.docbook |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kid3-1.4-docbook42.patch ---
http://sf.net/tracker/?func=detail&aid=3009644&group_id=70849&atid=529223

diff -up kid3-1.4/doc/de/index.docbook~ kid3-1.4/doc/de/index.docbook
--- kid3-1.4/doc/de/index.docbook~	2010-03-05 20:32:27.000000000 +0200
+++ kid3-1.4/doc/de/index.docbook	2010-05-31 23:01:01.624429816 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kid3 '<application>Kid3</application>'>
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % German "INCLUDE"><!-- change language only here -->
diff -up kid3-1.4/doc/en/index.docbook~ kid3-1.4/doc/en/index.docbook
--- kid3-1.4/doc/en/index.docbook~	2010-03-05 20:32:27.000000000 +0200
+++ kid3-1.4/doc/en/index.docbook	2010-05-31 23:01:07.055428079 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY kid3 '<application>Kid3</application>'>
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->


Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kid3.spec	6 Mar 2010 12:15:53 -0000	1.32
+++ kid3.spec	31 May 2010 21:03:02 -0000	1.33
@@ -1,12 +1,16 @@
 Name:           kid3
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?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
+# http://sf.net/tracker/?func=detail&aid=3009644&group_id=70849&atid=529223
+Patch0:         %{name}-1.4-docbook42.patch
+# http://sf.net/tracker/?func=detail&aid=2984989&group_id=70849&atid=529223
+Patch1:         %{name}-1.4-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs4-devel
@@ -30,6 +34,8 @@ looking for.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -43,16 +49,14 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 deb/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
 
-# preserve desktop entry location for from < 0.8 upgrades
+# preserve desktop entry location for upgrades
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
 rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
 
 desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category AudioVideoEditing \
     $RPM_BUILD_ROOT%{_datadir}/applications/fedora-kid3.desktop
   
-
 %find_lang %{name} --with-kde
 
 
@@ -88,6 +92,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon May 31 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.4-2
+- Patch to fix build with KDE 4.5 (DocBook 4.2).
+- Patch to improve desktop entry (MIME types, startup).
+
 * Sat Mar  6 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.4-1
 - Update to 1.4.