rpms/xscreensaver/devel xscreensaver-5.00-localefix-restrict.patch, 1.1, 1.2 xscreensaver.spec, 1.25, 1.26 xscreensaver-5.00-localesegv.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26223

Modified Files:
	xscreensaver-5.00-localefix-restrict.patch xscreensaver.spec 
Removed Files:
	xscreensaver-5.00-localesegv.patch 
Log Message:
* Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-18
- Unify locale releated patches.


xscreensaver-5.00-localefix-restrict.patch:

Index: xscreensaver-5.00-localefix-restrict.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.00-localefix-restrict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.00-localefix-restrict.patch	1 Jun 2006 03:26:28 -0000	1.1
+++ xscreensaver-5.00-localefix-restrict.patch	28 Aug 2006 08:26:30 -0000	1.2
@@ -1,6 +1,6 @@
---- xscreensaver-5.00/hacks/screenhack.c.localefix2	2006-05-24 07:09:58.000000000 +0900
-+++ xscreensaver-5.00/hacks/screenhack.c	2006-06-01 08:06:32.000000000 +0900
-@@ -166,19 +166,39 @@
+--- xscreensaver-5.00/hacks/screenhack.c.localefix	2006-05-24 07:09:58.000000000 +0900
++++ xscreensaver-5.00/hacks/screenhack.c	2006-08-28 16:40:50.000000000 +0900
+@@ -166,19 +166,38 @@
  reset_locale (void)
  {
  #ifdef HAVE_SETLOCALE
@@ -15,32 +15,32 @@
 +#endif
 +    0
 +  };
-+  int j;
++  int j1, j2;
++ 
++  for (j1 = 0; examine_locale[j1]; j1++)
++    {
++      const char *current_locale = setlocale(examine_locale[j1], NULL);
++      const char *env_locale = setlocale(examine_locale[j1], "");
++      const char *cmp_locale;
  
 -  while ((cmp_locale = change_locale[j]))
-+  for (j = 0; examine_locale[j]; j++)
-     {
+-    {
 -      if (!strncmp(current_locale, cmp_locale, strlen(cmp_locale)))
-+      const char *current_locale = setlocale(examine_locale[j], NULL);
-+      const char *env_locale = setlocale(examine_locale[j], "");
-+      const char *cmp_locale;
-+
 +      if (!env_locale || !*env_locale) 
  	{
 -	  setlocale(LC_ALL, "C");
 -	  break;
-+	  setlocale(examine_locale[j], current_locale);
++	  setlocale(examine_locale[j1], current_locale);
 +	  continue;
 +	}
 +
-+      while ((cmp_locale = change_locale[j]))
++      for (j2 = 0; (cmp_locale = change_locale[j2]); j2++)
 +	{
 +	  if (!strncmp(env_locale, cmp_locale, strlen(cmp_locale)))
 +	    {
-+	      (void) setlocale(examine_locale[j], "C");
++	      (void) setlocale(examine_locale[j2], "C");
 +	      continue;
 +	    }
-+	  j++;
  	}
 -      j++;
      }


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xscreensaver.spec	28 Aug 2006 00:28:52 -0000	1.25
+++ xscreensaver.spec	28 Aug 2006 08:26:30 -0000	1.26
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	17.1
+%define fedora_rel	18
 
 %define fedora_ver	5.91.1
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -34,7 +34,7 @@
 Patch110:	xscreensaver-5.00-fix-hacks.patch
 Patch111:	xscreensaver-5.00-kill-getimage.patch
 Patch112:	xscreensaver-5.00-po-correctdir.patch
-Patch113:	xscreensaver-5.00-localesegv.patch
+#Patch113:	xscreensaver-5.00-localesegv.patch
 
 %package base
 Summary: 	A minimal installation of xscreensaver
@@ -103,14 +103,14 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch5 -p1 -b .rootpasswd
 %patch8 -p1 -b .include-dir
-%patch101 -p1 -b .locale-fix-restrict
+%patch101 -p1 -b .locale-fix-strict
 %patch102 -p1 -b .matherr2
 %patch104 -p1 -b .xmlfix
 %patch105 -p1 -b .text-locale
 %patch110 -p1 -b .fix-hacks
 %patch111 -p1 -b .kill-getimage
 %patch112 -p1 -b .po-dir
-%patch113 -p1 -b .localesegv
+#%%patch113 -p1 -b .localesegv
 
 install -c -m644 -p %{SOURCE10} po/ja.po
 
@@ -304,6 +304,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-18
+- Unify locale releated patches.
+
 * Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-17.1
 - Rebuild.
 


--- xscreensaver-5.00-localesegv.patch DELETED ---