rpms/grip/FC-4 grip-cell-renderer.patch, NONE, 1.1 grip.1, NONE, 1.1 grip.spec, 1.4, 1.5

[Adrian Reber (adrian)]

Author: adrian

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

Modified Files:
	grip.spec 
Added Files:
	grip-cell-renderer.patch grip.1 
Log Message:
* Thu Jul 07 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-5
- added patch to fix cell renderer problem (BZ #162324)
- wrote and added a man page


grip-cell-renderer.patch:

--- NEW FILE grip-cell-renderer.patch ---
--- grip-3.2.0/src/cdplay.c	2004-04-23 18:26:40.000000000 +0200
+++ grip-3.2.0-cell-fix/src/cdplay.c	2005-07-07 08:30:04.000000000 +0200
@@ -294,6 +294,8 @@
   GtkRequisition sizereq;
   GtkWidget *scroll;
   GtkTreeViewColumn *column;
+  GtkCellRenderer *track_renderer;
+  GtkCellRenderer *length_renderer;
   GtkCellRenderer *renderer;
   GtkTreeSelection *select;
 
@@ -321,9 +323,9 @@
   uinfo->track_list=
     gtk_tree_view_new_with_model(GTK_TREE_MODEL(uinfo->track_list_store));
 
-  renderer=gtk_cell_renderer_text_new();
+  track_renderer=gtk_cell_renderer_text_new();
 
-  column=gtk_tree_view_column_new_with_attributes(_("Track"),renderer,
+  column=gtk_tree_view_column_new_with_attributes(_("Track"),track_renderer,
 						  "text",TRACKLIST_TRACK_COL,
 						  NULL);
 
@@ -334,7 +336,8 @@
 
   gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column);
 
-  column=gtk_tree_view_column_new_with_attributes(_("Length"),renderer,
+  length_renderer=gtk_cell_renderer_text_new();
+  column=gtk_tree_view_column_new_with_attributes(_("Length"),length_renderer,
 						  "text",TRACKLIST_LENGTH_COL,
 						  NULL);
 


--- NEW FILE grip.1 ---
.TH GRIP "1" "July 2005" "grip 3.2.0" "User Commands"
.SH NAME
Grip \- Grip is a cd-player and cd-ripper for the Gnome desktop.
.SH SYNOPSIS
.B grip
[\fIoptions\fR]
.SH DESCRIPTION
Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping capabilities 
of 
.BR cd-paranoia (1)
builtin, but can also use external rippers (such as 
.BR cdda2wav (1)).
It also 
provides an automated frontend for audio encoders, 
letting you take a disc and transform it easily straight into compressed audio files. 
Internet disc 
lookups are supported for retrieving track information from disc database servers.
.SH OPTIONS
.TP
\-?, \fB\-\-help\fR
Show this help message
.TP
\fB\-\-usage\fR
Display brief usage message
.TP
\fB\-\-geometry\fR=\fIGEOMETRY\fR
Specify the geometry of the main
window
.TP
\fB\-\-config\fR=\fICONFIG\fR
Specify the config file to use (in
your home dir)
.TP
\fB\-\-device\fR=\fIDEVICE\fR
Specify the cdrom device to use
.TP
\fB\-\-scsi\-device\fR=\fIDEVICE\fR
Specify the generic scsi device to use
.TP
\fB\-\-small\fR
Launch in "small" (cd\-only) mode
.TP
\fB\-\-local\fR
"Local" mode \fB\-\-\fR do not look up disc
info on the net
.TP
\fB\-\-no\-redirect\fR
Do not do I/O redirection
.TP
\fB\-\-verbose\fR
Run in verbose (debug) mode
.TP
\fB\-\-version\fR
Show version information
.SH "SEE ALSO"
.BR  cd-paranoia (1)
.BR cdda2wav (1)
.SH AUTHOR
.SS "grip"
Mike Oliphant <grip at nostatic.org>
.SS "this manual page"
Adrian Reber <adrian at lisas.de>


Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grip.spec	5 Mar 2005 21:10:21 -0000	1.4
+++ grip.spec	7 Jul 2005 10:00:48 -0000	1.5
@@ -1,12 +1,14 @@
 Summary: Front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 4
+Release: 5%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Multimedia
-Source: http://dl.sf.net/grip/grip-%{version}.tar.gz
+Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz
+Source1: grip.1
 Patch1: grip-3.2.0-default.patch
+Patch2: grip-cell-renderer.patch
 URL: http://www.nostatic.org/grip/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
@@ -24,6 +26,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .rh-default-encoder
+%patch2 -p1 -b .cell-renderer
 
 %build
 %configure
@@ -35,6 +38,8 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install-am
 
+install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1
+
 cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
 StartupWMClass=Grip
 Encoding=UTF-8
@@ -67,8 +72,13 @@
 %{_datadir}/pixmaps/gripicon.png
 %{_datadir}/gnome/help/grip
 %{_datadir}/applications/*
+%{_mandir}/man1/*
 
 %changelog
+* Thu Jul 07 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-5
+- added patch to fix cell renderer problem (BZ #162324)
+- wrote and added a man page
+
 * Wed Mar 02 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-4
 - s/Copyright/License/
 - s/Serial/Epoch/