rpms/alphabet-soup/devel alphabet-soup-1.1-linux.patch, 1.1, 1.2 alphabet-soup.spec, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/alphabet-soup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13548

Modified Files:
	alphabet-soup-1.1-linux.patch alphabet-soup.spec 
Log Message:
* Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-3
- Update License tag for new Licensing Guidelines compliance
- Fix 3 calls of memset with the 2nd and 3th argument swaped,
  reported by Dave Jones


alphabet-soup-1.1-linux.patch:

Index: alphabet-soup-1.1-linux.patch
===================================================================
RCS file: /cvs/extras/rpms/alphabet-soup/devel/alphabet-soup-1.1-linux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alphabet-soup-1.1-linux.patch	4 Dec 2006 05:26:51 -0000	1.1
+++ alphabet-soup-1.1-linux.patch	9 Aug 2007 06:05:09 -0000	1.2
@@ -764,7 +764,7 @@
  		menu_dictionary_text();
  	}
  }
-@@ -241,7 +242,6 @@
+@@ -241,15 +242,12 @@
  		build_dictionary_list();
  	}
  	ncds_resume_music();
@@ -772,6 +772,24 @@
  }
  
  void config_init(void)
+ {
+-	memset(&menu, sizeof(GMENU), 0);
+-	
+ 	/* set up menu */
+-	memset(&menu, sizeof(GMENU), 0);
++	memset(&menu, 0, sizeof(GMENU));
+ 	menu.item[0].type = MENU_ITEM_TYPE_TEXT;
+ 	menu.item[0].data = "Configure";
+ 	menu.item[0].ox = 0;
+@@ -330,7 +328,7 @@ void config_init(void)
+ void menu_init(void)
+ {
+ 	/* set up menu */
+-	memset(&menu, sizeof(GMENU), 0);
++	memset(&menu, 0, sizeof(GMENU));
+ 	menu.item[0].type = MENU_ITEM_TYPE_TEXT;
+ 	menu.item[0].data = "Options";
+ 	menu.item[0].ox = 0;
 @@ -482,8 +482,6 @@
  
  void menu_logic(void)


Index: alphabet-soup.spec
===================================================================
RCS file: /cvs/extras/rpms/alphabet-soup/devel/alphabet-soup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alphabet-soup.spec	3 Aug 2007 19:07:27 -0000	1.2
+++ alphabet-soup.spec	9 Aug 2007 06:05:09 -0000	1.3
@@ -73,6 +73,8 @@
 %changelog
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-3
 - Update License tag for new Licensing Guidelines compliance
+- Fix 3 calls of memset with the 2nd and 3th argument swaped,
+  reported by Dave Jones
 
 * Sun Dec  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-2
 - Add dumb-devel to BR (bz 218023)