devel/linux_logo linux_logo-gcc4.patch, NONE, 1.1 linux_logo.spec, 1.5, 1.6

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/devel/linux_logo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11218

Modified Files:
	linux_logo.spec 
Added Files:
	linux_logo-gcc4.patch 
Log Message:
added gcc4 patch


linux_logo-gcc4.patch:

--- NEW FILE linux_logo-gcc4.patch ---
diff -ur linux_logo-4.09/linux_logo.c linux_logo-4.09.new/linux_logo.c
--- linux_logo-4.09/linux_logo.c	2004-03-17 16:01:00.000000000 -0500
+++ linux_logo-4.09.new/linux_logo.c	2029-02-21 03:21:23.569055000 -0500
@@ -106,7 +106,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -117,7 +117,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
diff -ur linux_logo-4.09/parse_logos.c linux_logo-4.09.new/parse_logos.c
--- linux_logo-4.09/parse_logos.c	2004-03-14 00:45:53.000000000 -0500
+++ linux_logo-4.09.new/parse_logos.c	2029-02-21 03:23:34.462989000 -0500
@@ -37,7 +37,7 @@
       if (logo_start) {
 	 size+=strlen(temp_st);
 	 if (new_logo->logo==NULL) {
-	    (char *)new_logo->logo=strdup(temp_st);
+	    new_logo->logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->logo=realloc(new_logo->logo,size+1);
@@ -48,7 +48,7 @@
       if (ascii_logo_start) {
          ascii_size+=strlen(temp_st);
 	 if (new_logo->ascii_logo==NULL) {
-	    (char *)new_logo->ascii_logo=strdup(temp_st);
+	    new_logo->ascii_logo=(char **)strdup(temp_st);
 	 }
 	 else {
 	    new_logo->ascii_logo=realloc(new_logo->ascii_logo,ascii_size+1);
@@ -69,7 +69,7 @@
 	 }
 	 if (!strncmp(temp_st,"DESCRIPTION_STRING",18)) {
 	    new_logo->description=strdup(temp_st+19);	   
-	    (char)(new_logo->description)[strlen(new_logo->description)-1]
+	    new_logo->description[strlen(new_logo->description)-1]
 	      ='\0';
 	 }
       }
@@ -173,11 +173,11 @@
 	  
 	  fprintf(ggg,"\tnew_logo->description=strdup(\"%s\");\n",
 		      logo_info_temp->description);
-	  fprintf(ggg,"\t(char *)new_logo->logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ysize=%d;\n",logo_info_temp->ysize);
-	  fprintf(ggg,"\t(char *)new_logo->ascii_logo=strdup(\"");
+	  fprintf(ggg,"\tnew_logo->ascii_logo=(char **)strdup(\"");
 	  sanitize_print_string((char *)logo_info_temp->ascii_logo,ggg);
 	  fprintf(ggg,"\");\n");
 	  fprintf(ggg,"\tnew_logo->ascii_ysize=%d;\n",


Index: linux_logo.spec
===================================================================
RCS file: /cvs/extras/devel/linux_logo/linux_logo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux_logo.spec	16 Nov 2004 17:52:18 -0000	1.5
+++ linux_logo.spec	30 Mar 2005 15:15:52 -0000	1.6
@@ -3,11 +3,12 @@
 Summary: The linux logo - a colorful console penguin logo
 Name: linux_logo
 Version: 4.09
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 URL: http://www.deater.net/weave/vmwprod/linux_logo/
 Source: http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-%{version}.tar.gz
+Patch0: linux_logo-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gettext
 
@@ -17,7 +18,7 @@
 
 %prep
 %setup
-
+%patch0 -p1
 
 %build
 for logo in ./logos/*.logo ./logos/*/*.logo; do
@@ -43,12 +44,16 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root, 0755)
-%doc CHANGES COPYING README LINUX_LOGO.FAQ README* TODO USAGE
+%doc CHANGES COPYING LINUX_LOGO.FAQ README* TODO USAGE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Wed Mar 30 2005 Adrian Reber <adrian at lisas.de> 4.09-3
+- Added gcc4 patch
+- Fixed a warning
+
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 4.09-2
 - Bump release to provide Extras upgrade path.