upgrading package: mico 2.3.10 -> 2.3.11

mico/mico.patch

@@ -1,67 +1,7 @@
-diff -Naur mico.orig/Makefile mico/Makefile
---- mico.orig/Makefile	Fri Feb 14 11:55:53 2003
-+++ mico/Makefile	Fri Feb 14 14:15:35 2003
-@@ -72,7 +72,7 @@
- 		$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
- 		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
- 	fi
--	-ldconfig
-+#	-ldconfig
- 
- install-cd:
- 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
-diff -Naur mico.orig/include/mico/os-math.h mico/include/mico/os-math.h
---- mico.orig/include/mico/os-math.h	2003-05-26 12:55:46.000000000 +0200
-+++ mico/include/mico/os-math.h	2003-07-01 12:00:36.000000000 +0200
-@@ -279,11 +279,7 @@
- #include <unistd.h>
- #include <signal.h>
- #include <sys/types.h>
--
--#if !defined(__GNUG__) || !defined(__sgi)
--// conflict for initstate ()
--#include <math.h>
--#endif
-+#include <cmath>
- 
- #ifdef HAVE_FLOAT_H
- #include <float.h>
-@@ -343,6 +339,7 @@
- 
-     static MICO_Boolean is_infinity (MICO_Double d)
-     {
-+        using namespace std;
- #if defined(HAVE_ISINF)
- 	return isinf (d);
- #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
-@@ -354,6 +351,7 @@
- 
-     static MICO_Boolean is_nan (MICO_Double d)
-     {
-+        using namespace std;
- #if defined(HAVE_ISNAN)
- 	return isnan (d);
- #else
-@@ -402,6 +400,7 @@
- 
-     static MICO_Boolean is_infinityl (MICO_LongDouble d)
-     {
-+        using namespace std;
- #if defined(HAVE_ISINFL)
- 	return isinfl (d);
- #elif defined(HAVE_ISINF)
-@@ -413,6 +412,7 @@
- 
-     static MICO_Boolean is_nanl (MICO_LongDouble d)
-     {
-+        using namespace std;
- #if defined(HAVE_ISNANL)
- 	return isnanl (d);
- #elif defined(HAVE_ISNAN)
-diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
---- mico.orig/auxdir/tclmico.cc	Fri Dec 11 14:24:55 1998
-+++ mico/auxdir/tclmico.cc	Wed Jul 30 16:14:17 2003
-@@ -46,9 +46,9 @@
+Index: auxdir/tclmico.cc
+--- auxdir/tclmico.cc.orig	2003-10-13 11:49:22.000000000 +0200
++++ auxdir/tclmico.cc	2003-10-13 20:02:21.000000000 +0200
+@@ -48,9 +48,9 @@
      TclDispatcher *disp = event->disp;
      CORBA::Long handle = event->handle;
  
@@ -73,7 +13,7 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
  	for (i = disp->fevents.begin(); i != disp->fevents.end(); ++i) {
  	    if ((*i)->handle != handle)
  		continue;
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
      TimerEvent *event = (TimerEvent *)_event;
      TclDispatcher *disp = event->disp;
  
@@ -82,7 +22,7 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
      for (i = disp->tevents.begin(); i != disp->tevents.end(); ++i) {
          if ((*i) == event) {
  	  disp->tevents.erase(i);
-@@ -97,13 +97,13 @@
+@@ -99,13 +99,13 @@
  
  TclDispatcher::~TclDispatcher ()
  {
@@ -98,7 +38,7 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
      for (j = tevents.begin(); j != tevents.end(); ++j) {
  	(*j)->cb->callback (this, Remove);
  	delete *j;
-@@ -123,7 +123,7 @@
+@@ -125,7 +125,7 @@
      ev = 0;
      int mask = 0;
  
@@ -107,7 +47,7 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
      for (i = fevents.begin(); i != fevents.end(); ++i) {
  	if ((*i)->handle != handle)
  	    continue;
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
  TclDispatcher::remove (CORBA::DispatcherCallback *cb, Event e)
  {
      if (e == All || e == Timer) {
@@ -116,7 +56,7 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
  	for (i = tevents.begin(); i != tevents.end(); i = next) {
  	    next = i;
  	    ++next;
-@@ -195,7 +195,7 @@
+@@ -197,7 +197,7 @@
  	}
      }
      if (e == All || e == Read || e == Write || e == Except) {
@@ -125,17 +65,63 @@ diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
  	for (i = fevents.begin(); i != fevents.end(); i = next) {
  	    next = i;
  	    ++next;
-diff -Naur mico.orig/include/mico/tclmico.h mico/include/mico/tclmico.h
---- mico.orig/include/mico/tclmico.h	Mon May 26 12:55:46 2003
-+++ mico/include/mico/tclmico.h	Wed Jul 30 16:13:57 2003
-@@ -57,8 +57,8 @@
- 	    : disp (_disp), token (_token), cb (_cb)
- 	{}
-     };
--    list<FileEvent *> fevents;
--    list<TimerEvent *> tevents;
-+    std::list<FileEvent *> fevents;
-+    std::list<TimerEvent *> tevents;
+Index: include/mico/os-math.h
+--- include/mico/os-math.h.orig	2003-10-13 11:49:32.000000000 +0200
++++ include/mico/os-math.h	2003-10-13 20:02:21.000000000 +0200
+@@ -296,11 +296,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <sys/types.h>
+-
+-#if !defined(__GNUG__) || !defined(__sgi)
+-// conflict for initstate ()
+-#include <math.h>
+-#endif
++#include <cmath>
+ 
+ #ifdef HAVE_FLOAT_H
+ #include <float.h>
+@@ -360,6 +356,7 @@
  
-     static void input_callback (ClientData, int mask);
-     static void timer_callback (ClientData);
+     static MICO_Boolean is_infinity (MICO_Double d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISINF)
+ 	return isinf (d);
+ #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+@@ -371,6 +368,7 @@
+ 
+     static MICO_Boolean is_nan (MICO_Double d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISNAN)
+ 	return isnan (d);
+ #else
+@@ -419,6 +417,7 @@
+ 
+     static MICO_Boolean is_infinityl (MICO_LongDouble d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISINFL)
+ 	return isinfl (d);
+ #elif defined(HAVE_ISINF)
+@@ -430,6 +429,7 @@
+ 
+     static MICO_Boolean is_nanl (MICO_LongDouble d)
+     {
++        using namespace std;
+ #if defined(HAVE_ISNANL)
+ 	return isnanl (d);
+ #elif defined(HAVE_ISNAN)
+Index: Makefile
+--- Makefile.orig	2003-10-13 11:49:22.000000000 +0200
++++ Makefile	2003-10-13 20:02:21.000000000 +0200
+@@ -73,7 +73,7 @@
+ 		$(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
+ 		$(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
+ 	fi
+-	-ldconfig
++#	-ldconfig
+ 
+ install-cd:
+ 	for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done

mico/mico.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        System
 License:      LGPL/GPL
-Version:      2.3.10
-Release:      20031008
+Version:      2.3.11
+Release:      20031013
 
 #   package options
 %option       with_ssl      no
@@ -89,7 +89,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n mico
-    %patch -p1
+    %patch -p0
 
 %build
     CC="%{l_cc}"