Преглед на файлове

downgraded to current stable release, added conflict to pnet, changed install-sh to ginstall to create directories, added fix for systems that have function signbit

Thorsten Hohmeier преди 21 години
родител
ревизия
b262dcc1b7
променени са 2 файла, в които са добавени 12 реда и са изтрити 4 реда
  1. 3 1
      mono/mono.patch
  2. 9 3
      mono/mono.spec

+ 3 - 1
mono/mono.patch

@@ -56,10 +56,11 @@ Index: mono/mini/mini-x86.c
 diff -Nau mono/mini/mini-x86.c.orig mono/mini/mini-x86.c
 --- mono/mini/mini-x86.c.orig	2004-05-27 05:06:43 +0200
 +++ mono/mini/mini-x86.c	2004-06-16 20:17:58 +0200
-@@ -47,6 +47,32 @@
+@@ -47,6 +47,34 @@
  	return "unknown";
  }
  
++#ifndef signbit
 +union IEEEd2bits {
 +    double d;
 +    struct {
@@ -86,6 +87,7 @@ diff -Nau mono/mini/mini-x86.c.orig mono/mini/mini-x86.c
 +    return (u.bits.sign);
 +}
 +
++#endif /* signbit */
  /*
   * mono_arch_get_argument_info:
   * @csig:  a method signature

+ 9 - 3
mono/mono.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Language
 License:      GPL
-Version:      1.1.2
-Release:      20041104
+Version:      1.0.5
+Release:      20050201
 
 #   list of sources
 Source0:      http://www.go-mono.com/archive/%{version}/mono-%{version}.tar.gz
@@ -49,6 +49,7 @@ BuildPreReq:  glib2, glib2::with_threads = yes
 PreReq:       glib2, glib2::with_threads = yes
 AutoReq:      no
 AutoReqProv:  no
+Conflicts:    pnet
 
 %description
     The Mono project is an open source effort to create a free Unix
@@ -60,7 +61,7 @@ AutoReqProv:  no
 
 %track
     prog mono = {
-        comment   = "ms: 1.3 monoburg Fatal error 'Spinlock called when not threaded.'"
+        comment   = "tho: 1.1.x is development tree; stay with 1.0.x until 1.2"
         version   = %{version}
         url       = http://www.go-mono.com/download.html
         regex     = mono-(__VER__)\.tar\.gz
@@ -100,6 +101,11 @@ AutoReqProv:  no
     %{l_make} %{l_mflags -O}
 
 %install
+    #   use a working install to create subdirs
+    %{l_shtool} subst \
+        -e 's;\$(mkdir_p);%{l_prefix}/bin/ginstall -d;' \
+        Makefile */Makefile */*/Makefile
+
     #   install program
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"