rpms/slang/devel slang-nointerlibc.patch, NONE, 1.1 slang.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: praszyk

Update of /cvs/dist/rpms/slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7179

Modified Files:
	slang.spec 
Added Files:
	slang-nointerlibc.patch 
Log Message:
Rebuild.


slang-nointerlibc.patch:
 slang.h    |    4 ++--
 slclass.c  |    2 +-
 sldisply.c |    8 ++++----
 slmisc.c   |   16 ++++++++--------
 slsmg.c    |    6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

--- NEW FILE slang-nointerlibc.patch ---
--- slang-1.4.9/src/slclass.c.rasold	2005-10-24 15:53:12.000000000 +0200
+++ slang-1.4.9/src/slclass.c	2005-10-24 16:01:46.000000000 +0200
@@ -911,7 +911,7 @@
      };
 
    if ((op > SLANG_MOD) || (op <= 0))
-     return "- ?? -";		       /* Note: -??- is a trigraph (sigh) */
+     return "- ?? -";		       /* Note: ? ? - is a trigraph (sigh) */
    return ops[op - 1];
 }
 
--- slang-1.4.9/src/slsmg.c.rasold	2005-10-24 15:52:47.000000000 +0200
+++ slang-1.4.9/src/slsmg.c	2005-10-24 16:00:24.000000000 +0200
@@ -1522,9 +1522,9 @@
    static wchar_t hbuf[16];
    int i;
 #else
-void SLsmg_fill_region (int r, int c, unsigned int dr, unsigned int dc, unsigned char ch)
-{
-   static unsigned char hbuf[16];
+/*@*/void SLsmg_fill_region (int r, int c, unsigned int dr, unsigned int dc, unsigned char ch)
+/*@*/{
+/*@*/   static unsigned char hbuf[16];
 #endif /* UTF8 */
    int count;
    int dcmax, rmax;
--- slang-1.4.9/src/slang.h.rasold	2005-10-24 15:52:55.000000000 +0200
+++ slang-1.4.9/src/slang.h	2005-10-24 16:01:11.000000000 +0200
@@ -2101,10 +2101,10 @@
    extern void deinit_##name##_module (void)
 
 #if 0
-{
+/*@*/{
 #endif
 #ifdef __cplusplus
-}
+/*@*/}
 #endif
 
 #endif  /* _DAVIS_SLANG_H_ */
--- slang-1.4.9/src/slmisc.c.rasold	2005-10-24 16:10:22.000000000 +0200
+++ slang-1.4.9/src/slmisc.c	2005-10-24 16:04:39.000000000 +0200
@@ -565,19 +565,19 @@
    return (int) SLatol (s);
 }
 
-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
-extern int __libc_enable_secure;
-# define HAVE___LIBC_ENABLE_SECURE 1
-#endif
+/*#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) */
+/*extern int __libc_enable_secure; */
+/*# define HAVE___LIBC_ENABLE_SECURE 1 */
+/*#endif */
 
 int _SLsecure_issetugid (void)
 {
 #ifdef HAVE_ISSETUGID
    return (1 == issetugid ());
 #else
-# ifdef HAVE___LIBC_ENABLE_SECURE
-   return __libc_enable_secure;
-# else
+/*# ifdef HAVE___LIBC_ENABLE_SECURE */
+/*   return __libc_enable_secure; */
+/*# else */
 #  if defined(HAVE_GETUID) && defined(HAVE_GETEUID) && defined(HAVE_GETGID) && defined(HAVE_GETEUID)
    static int enable_secure;
    if (enable_secure == 0)
@@ -592,7 +592,7 @@
 #  else
    return 0;
 #  endif
-# endif
+/*# endif*/
 #endif
 }
 
--- slang-1.4.9/src/sldisply.c.rasold	2005-10-24 15:52:28.000000000 +0200
+++ slang-1.4.9/src/sldisply.c	2005-10-24 15:59:45.000000000 +0200
@@ -1445,10 +1445,10 @@
    a = SLSMG_EXTRACT_COLOR(a) & 0x7F;
    b = SLSMG_EXTRACT_COLOR(b) & 0x7F;
 #else
-static int bce_color_eqs (unsigned int a, unsigned int b)
-{
-   a = COLOR_OF(a);
-   b = COLOR_OF(b);
+/*@*/static int bce_color_eqs (unsigned int a, unsigned int b)
+/*@*/{
+/*@*/   a = COLOR_OF(a);
+/*@*/   b = COLOR_OF(b);
 #endif
    
    if (a == b)


Index: slang.spec
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/slang.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- slang.spec	24 Oct 2005 14:26:34 -0000	1.27
+++ slang.spec	24 Oct 2005 14:35:30 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: slang
 Version: 1.4.9
-Release: 22
+Release: 23
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
@@ -95,6 +95,9 @@
 %{_includedir}/slang
 
 %changelog
+* Mon Oct 24 2005 Petr Raszyk <praszyk at redhat.com> - 1.4.9-23
+- rebuild
+
 * Mon Oct 24 2005 Petr Raszyk <praszyk at redhat.com> - 1.4.9-22
 - libslang-utf8.so should not use the symbol __libc_enable_secure 
 - (#161536). slang-nointerlibc.patch