rpms/gbdfed/devel gbdfed-1.5-getline.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gbdfed.spec, 1.3, 1.4 sources, 1.2, 1.3 gbdfed-1.4-gtk-deprecated-fix.patch, 1.1, NONE gbdfed-1.4-patch1, 1.1, NONE

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/gbdfed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17782

Modified Files:
	.cvsignore gbdfed.spec sources 
Added Files:
	gbdfed-1.5-getline.patch 
Removed Files:
	gbdfed-1.4-gtk-deprecated-fix.patch gbdfed-1.4-patch1 
Log Message:
1.5

gbdfed-1.5-getline.patch:
 bdfgname.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gbdfed-1.5-getline.patch ---
diff -up gbdfed-1.5/bdfgname.c.BAD gbdfed-1.5/bdfgname.c
--- gbdfed-1.5/bdfgname.c.BAD	2009-07-28 09:34:47.110216848 -0400
+++ gbdfed-1.5/bdfgname.c	2009-07-28 09:35:12.011257674 -0400
@@ -39,7 +39,7 @@ static unsigned int adobe_names_used;
 #define MAX_GLYPH_NAME_LEN 127
 
 static int
-getline(FILE *in, char *buf, int limit)
+_bdf_getline(FILE *in, char *buf, int limit)
 {
     int c, i;
 
@@ -78,11 +78,11 @@ _bdf_find_name(int code, char *name, FIL
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         if (buf[0] == 0)
@@ -139,11 +139,11 @@ _bdf_load_adobe_names(FILE *in)
 
     while (!feof(in)) {
         pos = ftell(in);
-        (void) getline(in, buf, 256);
+        (void) _bdf_getline(in, buf, 256);
         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
             buf[0] = 0;
             pos = ftell(in);
-            (void) getline(in, buf, 256);
+            (void) _bdf_getline(in, buf, 256);
         }
 
         if (adobe_names_used == adobe_names_size) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbdfed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Dec 2008 15:15:43 -0000	1.2
+++ .cvsignore	28 Jul 2009 13:44:42 -0000	1.3
@@ -1 +1 @@
-gbdfed-1.4.tbz2
+gbdfed-1.5.tbz2


Index: gbdfed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gbdfed/devel/gbdfed.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gbdfed.spec	24 Jul 2009 23:33:28 -0000	1.3
+++ gbdfed.spec	28 Jul 2009 13:44:42 -0000	1.4
@@ -1,15 +1,14 @@
 Name:		gbdfed
 Summary: 	Bitmap Font Editor
-Version:	1.4
-Release:	3%{?dist}
+Version:	1.5
+Release:	1%{?dist}
 License:	MIT
 Group:		Applications/System
 Source0:	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}-%{version}.tbz2
 Source1:	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}16x16.png
 Source2:	gbdfed.desktop
-Patch0:		http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}-1.4-patch1
-# Fix the code to not use deprecated aliases
-Patch1:		gbdfed-1.4-gtk-deprecated-fix.patch
+# Fix conflict with getline() in stdio.h
+Patch0:		gbdfed-1.5-getline.patch
 URL:		http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel, pango-devel, libX11-devel, libICE-devel, gtk2-devel
@@ -23,8 +22,7 @@ editing font properties. The editor work
 
 %prep
 %setup -q 
-%patch0 -p1 -b .patch1
-%patch1 -p1 -b .gtk-deprecated-fix
+%patch0 -p1 -b .getline
 
 %build
 %configure
@@ -52,6 +50,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/gbdfed*
 
 %changelog
+* Tue Jul 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5-1
+- update to 1.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbdfed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Dec 2008 15:15:43 -0000	1.2
+++ sources	28 Jul 2009 13:44:42 -0000	1.3
@@ -1 +1 @@
-97dd44876f83caa5c3ae2c2479d7bff2  gbdfed-1.4.tbz2
+39d62dc6269a2350626b3d14678e13b4  gbdfed-1.5.tbz2


--- gbdfed-1.4-gtk-deprecated-fix.patch DELETED ---


--- gbdfed-1.4-patch1 DELETED ---