rpms/grip/F-7 grip-3.2.0-lookup.patch, NONE, 1.1 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/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31416

Modified Files:
	grip-3.2.0-default.patch grip.spec 
Added Files:
	grip-3.2.0-lookup.patch 
Removed Files:
	grip-cell-renderer.patch 
Log Message:
* 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)


grip-3.2.0-lookup.patch:

--- NEW FILE grip-3.2.0-lookup.patch ---
diff -ur grip-3.2.0/src/gripcfg.c grip-3.2.0.new/src/gripcfg.c
--- grip-3.2.0/src/gripcfg.c	2007-07-23 09:49:12.000000000 +0200
+++ grip-3.2.0.new/src/gripcfg.c	2007-07-23 09:50:46.000000000 +0200
@@ -62,13 +62,6 @@
 				      {"",""}
 };
 
-static CFGEntry encoder_cfg_entries[]={
-  {"name",CFG_ENTRY_STRING,256,NULL},
-  {"cmdline",CFG_ENTRY_STRING,256,NULL},
-  {"exe",CFG_ENTRY_STRING,256,NULL},
-  {"extension",CFG_ENTRY_STRING,10,NULL}
-};
-
 static void UseProxyChanged(GtkWidget *widget,gpointer data)
 {
   GripInfo *ginfo;
@@ -781,7 +774,7 @@
   };
 
 #ifdef CDPAR
-  if(ripcfg==0) return;
+  if(ripcfg==0) return TRUE;
 #endif
 
   sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
@@ -825,6 +818,9 @@
 
   if(LoadEncoderConfig(ginfo,ginfo->selected_encoder)) {
     strcpy(buf,ginfo->mp3exename);
+    /* in addition to searching the path during rip and encode
+     * also do a path lookup of the executable during config switches */
+    FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
     gtk_entry_set_text(GTK_ENTRY(uinfo->mp3exename_entry),buf);
 
     strcpy(buf,ginfo->mp3cmdline);
diff -ur grip-3.2.0/src/rip.c grip-3.2.0.new/src/rip.c
--- grip-3.2.0/src/rip.c	2004-04-15 20:21:15.000000000 +0200
+++ grip-3.2.0.new/src/rip.c	2007-07-23 09:47:34.000000000 +0200
@@ -1100,8 +1100,6 @@
 {
   static char res[PATH_MAX];
   EncodeTrack *enc_track;
-  gchar *conv_str,*st;
-  gsize rb,wb;
 
   enc_track=(EncodeTrack *)data;
 
@@ -1250,12 +1248,17 @@
 {
   GripInfo *ginfo;
   gboolean result;
+  char buf[sizeof(ginfo->ripexename) > sizeof(ginfo->mp3exename) ? sizeof(ginfo->ripexename) : sizeof(ginfo->mp3exename)];
 
   ginfo=(GripInfo *)data;
 
   if(widget) ginfo->doencode=FALSE;
   else ginfo->doencode=TRUE;
 
+  /* Let's find the ripper in the path; this changes the config */
+  FindExeInPath(ginfo->ripexename, buf, sizeof(buf));
+  strncpy(ginfo->ripexename, buf, sizeof(ginfo->ripexename));
+
   if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
     DisplayMsg(_("Invalid rip executable\nCheck your rip config"));
 
@@ -1263,6 +1266,9 @@
     return;
   }
 
+  /* the same for mp3exename */
+  FindExeInPath(ginfo->mp3exename, buf, sizeof(buf));
+  strncpy(ginfo->mp3exename, buf, sizeof(ginfo->mp3exename));
   if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
     DisplayMsg(_("Invalid encoder executable\nCheck your encoder config"));
 
@@ -1504,8 +1510,9 @@
       ginfo->rippid=fork();
       
       if(ginfo->rippid==0) {
+	int i;
 	CloseStuff(ginfo);
-	nice(ginfo->ripnice);
+	i=nice(ginfo->ripnice);
 	execv(ginfo->ripexename,char_args);
 	
 	LogStatus(ginfo,_("Exec failed\n"));
@@ -1539,6 +1546,7 @@
   int paranoia_mode;
   int dup_output_fd;
   FILE *output_fp;
+  int i;
 
   ginfo=(GripInfo *)arg;
 
@@ -1559,7 +1567,7 @@
   
   ginfo->rip_smile_level=0;
   
-  nice(ginfo->ripnice);
+  i=nice(ginfo->ripnice);
 
   dup_output_fd=dup(GetStatusWindowPipe(ginfo->gui_info.rip_status_window));
   output_fp=fdopen(dup_output_fd,"w");
@@ -1742,9 +1750,10 @@
   ginfo->mp3pid[cpu]=fork();
   
   if(ginfo->mp3pid[cpu]==0) {
+    int i;
     CloseStuff(ginfo);
     setsid();
-    nice(ginfo->mp3nice);
+    i=nice(ginfo->mp3nice);
     execv(ginfo->mp3exename,char_args);
     _exit(0);
   }

grip-3.2.0-default.patch:

Index: grip-3.2.0-default.patch
===================================================================
RCS file: /cvs/extras/rpms/grip/F-7/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	17 Mar 2007 11:34:08 -0000	1.3
+++ grip-3.2.0-default.patch	10 Jun 2008 12:47:57 -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/F-7/grip.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grip.spec	17 Mar 2007 11:34:08 -0000	1.17
+++ grip.spec	10 Jun 2008 12:47:57 -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: 19%{?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,21 @@
 
 %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} .
+
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -74,6 +82,17 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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 ---