rpms/grip/devel grip-3.2.0-default.patch, 1.2, 1.3 grip.spec, 1.16, 1.17

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1161

Modified Files:
	grip-3.2.0-default.patch grip.spec 
Log Message:
* Wed Jan 17 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-16
- fixes for #220777, #222574, #232755


grip-3.2.0-default.patch:

Index: grip-3.2.0-default.patch
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip-3.2.0-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grip-3.2.0-default.patch	2 Jan 2007 23:20:15 -0000	1.2
+++ grip-3.2.0-default.patch	17 Mar 2007 11:34:08 -0000	1.3
@@ -28,7 +28,7 @@
  #endif
    ginfo->in_rip_thread=FALSE;
 -  strcpy(ginfo->ripfileformat,"~/mp3/%A/%d/%n.wav");
-+  strcpy(ginfo->ripfileformat,"~/ogg/%A/%d/%n.wav");
++  strcpy(ginfo->ripfileformat,"~/%x/%A/%d/%n.wav");
  #ifdef __linux__
    FindExeInPath("cdparanoia", ginfo->ripexename, sizeof(ginfo->ripexename));
    strcpy(ginfo->ripcmdline,"-d %c %t:[.%s]-%t:[.%e] %w");
@@ -38,9 +38,10 @@
    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->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,"~/mp3/%A/%d/%n.%x");
++  strcpy(ginfo->mp3fileformat,"~/%x/%A/%d/%n.%x");
    strcpy(ginfo->mp3extension,"mp3");
    ginfo->mp3nice=0;
    *ginfo->mp3_filter_cmd='\0';
@@ -49,7 +50,18 @@
    ginfo->add_m3u=TRUE;
    ginfo->rel_m3u=TRUE;
 -  strcpy(ginfo->m3ufileformat,"~/mp3/%A-%d.m3u");
-+  strcpy(ginfo->m3ufileformat,"~/ogg/%A-%d.m3u");
++  strcpy(ginfo->m3ufileformat,"~/%x/%A-%d.m3u");
    ginfo->kbits_per_sec=128;
    ginfo->edit_num_cpu=1;
    ginfo->doid3=TRUE;
+
+--- grip-3.2.0/src/grip.c.org	2004-04-16 03:23:54.000000000 +0900
++++ grip-3.2.0/src/grip.c	2007-03-17 14:40:07.078791467 +0900
+@@ -515,7 +515,7 @@
+   GtkWidget *logo;
+   GtkWidget *ebox;
+   GtkWidget *button;
+-  char versionbuf[20];
++  char versionbuf[40];
+ 
+   aboutpage=MakeNewPage(uinfo->notebook,_("About"));


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grip.spec	2 Jan 2007 23:20:15 -0000	1.16
+++ grip.spec	17 Mar 2007 11:34:08 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
@@ -44,7 +44,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install-am
 
-install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1
+install -p -m644 %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1
 
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
@@ -74,6 +74,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 17 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-16
+- fixes for #220777, #222574, #232755
+
 * Wed Jan 03 2007 Adrian Reber <adrian at lisas.de> - 1:3.2.0-15
 - changed default file extension (#220777)