rpms/grip/EL-5 grip-3.2.0-default.patch, 1.3, 1.4 grip.spec, 1.17, 1.18 grip-cell-renderer.patch, 1.1, NONE

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/grip/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386

Modified Files:
	grip-3.2.0-default.patch grip.spec 
Removed Files:
	grip-cell-renderer.patch 
Log Message:
* Sat Jul 26 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-20
- fixed "Grip silently crahses on F8" (#456721)
  (converted non UTF-8 .po files to UTF-8)


grip-3.2.0-default.patch:

Index: grip-3.2.0-default.patch
===================================================================
RCS file: /cvs/extras/rpms/grip/EL-5/grip-3.2.0-default.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grip-3.2.0-default.patch	18 Mar 2007 00:06:46 -0000	1.3
+++ grip-3.2.0-default.patch	28 Jul 2008 07:13:17 -0000	1.4
@@ -35,14 +35,16 @@
 @@ -856,9 +856,9 @@
    *ginfo->wav_filter_cmd='\0';
    *ginfo->disc_filter_cmd='\0';
-   ginfo->selected_encoder=1;
+-  ginfo->selected_encoder=1;
 -  strcpy(ginfo->mp3cmdline,"-h -b %b %w %m");
 -  FindExeInPath("lame", ginfo->mp3exename, sizeof(ginfo->mp3exename));
 -  strcpy(ginfo->mp3fileformat,"~/mp3/%A/%d/%n.%x");
+-  strcpy(ginfo->mp3extension,"mp3");
++  ginfo->selected_encoder=0;
 +  strcpy(ginfo->mp3cmdline,"-o %m -a %a -l %d -t %n -N %t -G %G -d %y -q 4 %w");
 +  FindExeInPath("oggenc", ginfo->mp3exename, sizeof(ginfo->mp3exename));
 +  strcpy(ginfo->mp3fileformat,"~/%x/%A/%d/%n.%x");
-   strcpy(ginfo->mp3extension,"mp3");
++  strcpy(ginfo->mp3extension,"ogg");
    ginfo->mp3nice=0;
    *ginfo->mp3_filter_cmd='\0';
 @@ -866,7 +866,7 @@


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/EL-5/grip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grip.spec	18 Mar 2007 00:06:46 -0000	1.17
+++ grip.spec	28 Jul 2008 07:13:17 -0000	1.18
@@ -1,17 +1,17 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 16%{?dist}
+Release: 20%{?dist}
 Epoch: 1
-License: GPL
+License: GPLv2+
 Group: Applications/Multimedia
-Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/grip/grip-%{version}.tar.gz
 Source1: grip.1
 Patch1: grip-3.2.0-default.patch
-Patch2: grip-cell-renderer.patch
-Patch3: grip-3.2.0-id3.c.patch
-Patch4: grip.desktop.patch
-Patch5: grip-64bit-fix.patch
+Patch2: grip-3.2.0-id3.c.patch
+Patch3: grip.desktop.patch
+Patch4: grip-64bit-fix.patch
+Patch5: grip-3.2.0-lookup.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -28,13 +28,33 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .rh-default-encoder
-%patch2 -p1 -b .cell-renderer
-%patch3 -p1 -b .id3
+%patch1 -p1 -b .default-encoder
+%patch2 -p1 -b .id3
+%patch3
 %patch4
-%patch5
+%patch5 -p1
 
 %build
+
+# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are
+# not overwritten automatically. The original config.{guess,sub}
+# do not work on ppc64
+#
+# The following %%_prefix/lib cannot be %%_libdir !!
+cp -p %{_prefix}/lib/rpm/config.{guess,sub} .
+
+# convert non utf8 .po files to utf8
+# to fix #456721 (Grip silently crahses on F8)
+pushd po
+for i in de.po es.po fr.po pt_BR.po ru.po; do
+	iconv -f iso-8859-1 -t utf-8 $i > $i.tmp
+	mv $i.tmp $i
+done
+popd
+
+iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.tmp
+mv ChangeLog.tmp ChangeLog
+
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -74,6 +94,21 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jul 26 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-20
+- fixed "Grip silently crahses on F8" (#456721)
+  (converted non UTF-8 .po files to UTF-8)
+
+* Tue Jun 10 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-19
+- removed now unnecessary cell-renderer patch
+- fixed "default config creates ogg files with .mp3 extension" (#427017)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.2.0-18
+- Autorebuild for GCC 4.3
+
+* Mon Sep 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-17
+- search for ripper and encoder executables in path (#249150)
+- updated License:
+
 * Wed Jan 17 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-16
 - fixes for #220777, #222574, #232755
 


--- grip-cell-renderer.patch DELETED ---