rpms/glabels/devel glabels-fix-batch-segfault.patch, NONE, 1.1 glabels.spec, 1.17, 1.18

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/glabels/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130

Modified Files:
	glabels.spec 
Added Files:
	glabels-fix-batch-segfault.patch 
Log Message:
Fix bug 458473.

glabels-fix-batch-segfault.patch:

--- NEW FILE glabels-fix-batch-segfault.patch ---
diff -up ./src/glabels-batch.c.old ./src/glabels-batch.c
--- ./src/glabels-batch.c.old	2008-08-08 20:09:46.000000000 -0700
+++ ./src/glabels-batch.c	2008-08-08 20:10:07.000000000 -0700
@@ -121,6 +121,7 @@ main (int argc, char **argv)
         gl_debug_init ();
         gl_merge_init ();
         lgl_db_init ();
+        gl_prefs_init();
 
         /* now print the files */
         for (p = file_list; p; p = p->next) {


Index: glabels.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glabels.spec	21 Jul 2008 17:42:21 -0000	1.17
+++ glabels.spec	9 Aug 2008 03:31:23 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	2.2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -9,6 +9,9 @@
 
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 
+## https://bugzilla.redhat.com/show_bug.cgi?id=458473
+Patch0: 	%{name}-fix-batch-segfault.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -61,7 +64,7 @@
 
 
 %package 	doc
-License:	GFDL
+License:	GFDLv1.1+
 Summary:	Runtime documentation for %{name}
 Group:		Development/Libraries
 Requires(post):	scrollkeeper
@@ -73,6 +76,7 @@
 
 %prep
 %setup -q
+%patch0 -b .fix-patch-segfault
 
 
 %build
@@ -158,6 +162,10 @@
 
 
 %changelog
+* Fri Aug 08 2008 Peter Gordon <peter at thecodergeek.com> - 2.2.2-3
+- Add patch from Casey Harkins to fix a segfault in glabels-batch.
+- Resolves: bug #458473.
+
 * Mon Jul 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.2-2
 - fix license tag