rpms/grip/FC-4 grip.desktop.patch,NONE,1.1 grip.spec,1.7,1.8

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/grip/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5413

Modified Files:
	grip.spec 
Added Files:
	grip.desktop.patch 
Log Message:
* Wed Sep 14 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-8
- added .desktop patch from Chong Kai Xiong (#167989)


grip.desktop.patch:

--- NEW FILE grip.desktop.patch ---
--- grip.desktop	2004-04-16 01:51:47.000000000 +0800
+++ grip.desktop	2005-09-13 10:54:09.000000000 +0800
@@ -1,21 +1,20 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Grip
 Name[ca]=Grip
 Name[es]=Grip
+Name[de]=Grip
 Name[fi]=Grip
-Name[zh_CN]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
-Name[zh_CN.GB2312]=Grip MP3 å<88>¶ä½<9C>ç¨<8B>åº<8F>
-Name[zh_TW]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
-Name[zh_TW.Big5]=Grip MP3 製ä½<9C>ç¨<8B>å¼<8F>
+Name[zh_CN]=Grip
+Name[zh_TW]=Grip
 Comment=CD player/ripper
 Comment[ca]=Reproductor/extractor de CD d'audio
 Comment[es]=Reproductor/extractor de CDs de audio
+Comment[de]=Audio-CDs rippen und OGGs kodieren
 Comment[fr]=Lecteur/extracteur de CD audio
 Comment[fi]=CD-audion soitto- ja kopiointiohjelma
-Comment[zh_CN]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
-Comment[zh_CN.GB2312]=Grip 让æ<82>¨è½»æ<9D>¾å<88>¶ä½<9C> MP3 æ<96><87>件
-Comment[zh_TW]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
-Comment[zh_TW.Big5]=Grip è®<93>æ<82>¨è¼<95>é¬<86>製ä½<9C> MP3 æª<94>
+Comment[zh_CN]=CD 播放/抓取器
+Comment[zh_TW]=CD 播放/擷取程式
 Exec=grip
 Icon=gripicon.png
 Type=Application


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grip.spec	23 Aug 2005 15:13:07 -0000	1.7
+++ grip.spec	15 Sep 2005 20:10:26 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 6%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -10,6 +10,7 @@
 Patch1: grip-3.2.0-default.patch
 Patch2: grip-cell-renderer.patch
 Patch3: grip-3.2.0-id3.c.patch
+Patch4: grip.desktop.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -29,6 +30,7 @@
 %patch1 -p1 -b .rh-default-encoder
 %patch2 -p1 -b .cell-renderer
 %patch3 -p1 -b .id3
+%patch4
 
 %build
 %configure
@@ -44,14 +46,7 @@
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
-Encoding=UTF-8
 EOF
-iconv -f ISO-8859-1 -t UTF-8 \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
-
-mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
-	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
 	--vendor=fedora \
@@ -77,6 +72,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Sep 14 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-8
+- added .desktop patch from Chong Kai Xiong (#167989)
+
+* Sat Aug 20 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-7
+- rebuilt
+
 * Thu Aug 04 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-6
 - added patch for buffer overflow in id3.c (#160671)