Author: malekith                     Date: Sat Feb 19 10:58:23 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- update to todays svn trunk version (1.1.4 has an nasty --aot bug)
- fix license (it's MIT, LGPL or GPL depending on part you're interested
  in
- disable icu -- it is deprecated in the main sources now I guess
- make nptl bcond default on, at least on amd64 it doesn't build without it
- add install patch instead of a lib64 hack

---- Files affected:
SPECS:
   mono.spec (1.50.2.4 -> 1.50.2.5) 

---- Diffs:

================================================================
Index: SPECS/mono.spec
diff -u SPECS/mono.spec:1.50.2.4 SPECS/mono.spec:1.50.2.5
--- SPECS/mono.spec:1.50.2.4    Thu Jan 13 00:21:40 2005
+++ SPECS/mono.spec     Sat Feb 19 11:58:18 2005
@@ -1,18 +1,19 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with    nptl            # enable support for NPTL
+%bcond_without nptl            # enable support for NPTL
 #
 Summary:       Common Language Infrastructure implementation
 Summary(pl):   Implementacja Common Language Infrastructure
 Name:          mono
-Version:       1.1.3
+Version:       1.1.4.20050219svn
 Release:       0.1
-License:       LGPL
+License:       GPL/LGPL/MIT
 Group:         Development/Languages
-Source0:       
http://www.go-mono.com/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4d4da2dee2eefbc1ffc8a2312449f3ac
+Source0:       %{name}-%{version}.tar.bz2
+# Source0-md5: 61f1c0e0aa72e16ee9afc004c39d97a7
 Patch0:                %{name}-nolibs.patch
+Patch1:                %{name}-install.patch
 URL:           http://www.mono-project.com/
 ExcludeArch:   alpha
 BuildRequires: autoconf
@@ -21,8 +22,6 @@
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: icu
-BuildRequires: libicu-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # workaround for buggy gcc 3.3.1
@@ -42,6 +41,8 @@
   generate classes and code that can interoperate with other programming
   languages (The Common Language Specification: CLS).
 
+%{?with_nptl:This version was build with TLS __thread.}
+
 %description -l pl
 Platforma CLI (Common Language Infrastructure). Microsoft stworzył
 nową platformę developerską. Zalety tej platformy to:
@@ -54,6 +55,8 @@
   współpracujący z innymi językami programowania (The Common Language
   Specification: CLS).
 
+%{?with_nptl:Ta wersja została zbudowana z TLS __thread.}
+
 %package devel
 Summary:       Development resources for mono
 Summary(pl):   Zasoby programisty do mono
@@ -104,6 +107,18 @@
 %description ilasm -l pl
 Kompilator ILasm dla mono.
 
+%package jscript
+Summary:       jscript compiler for mono
+Summary(pl):   Kompilator jscript dla mono
+Group:         Development/Languages
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description jscript
+jscript compiler for mono.
+
+%description jscript -l pl
+Kompilator jscript dla mono.
+
 %package static
 Summary:       Static mono library
 Summary(pl):   Statyczna biblioteka mono
@@ -144,6 +159,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 # quick hack for sparc
 perl -p -i -e 's/LIBC="libc.so"//' configure.in
@@ -153,20 +169,23 @@
 cp -f /usr/share/automake/config.sub libgc
 %{__libtoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
+cd libgc
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ..
+
 %configure \
        %{?with_nptl:--with-tls=__thread} \
        %{!?with_nptl:--with-tls=pthread} \
        --with-preview=yes \
-       --with-icu=yes \
+       --with-icu=no \
        --with-jit=yes \
        --with-gc=included
-#%ifarch amd64
-#      --with-sigaltstack=yes \
-#      --with-gc=none
-#%else
-#%endif
 
 %{__make}
 
@@ -176,10 +195,6 @@
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
        
-%ifarch amd64
-mv -f $RPM_BUILD_ROOT/usr/lib/mono $RPM_BUILD_ROOT%{_libdir}
-%endif
-
 mv -f $RPM_BUILD_ROOT%{_prefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 rm -f $RPM_BUILD_ROOT%{_datadir}/jay/[A-Z]*
 
@@ -201,9 +216,10 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mint
 %ifarch %{ix86} ppc sparc amd64
 %attr(755,root,root) %{_bindir}/mono
+%else
+%attr(755,root,root) %{_bindir}/mint
 %endif
 %attr(755,root,root) %{_bindir}/cert*
 %attr(755,root,root) %{_bindir}/chktrust*
@@ -214,6 +230,7 @@
 %attr(755,root,root) %{_bindir}/setreg*
 %attr(755,root,root) %{_bindir}/signcode*
 %attr(755,root,root) %{_bindir}/sn*
+%attr(755,root,root) %{_bindir}/caspol
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/mono/*.*/*.dll
 %attr(755,root,root) %{_libdir}/mono/1.0/cert*
@@ -225,6 +242,7 @@
 %attr(755,root,root) %{_libdir}/mono/1.0/setreg*
 %attr(755,root,root) %{_libdir}/mono/1.0/signcode*
 %attr(755,root,root) %{_libdir}/mono/1.0/sn*
+%attr(755,root,root) %{_libdir}/mono/1.0/caspol*
 %{_mandir}/man1/cert*.1*
 %{_mandir}/man1/chktrust.1*
 %{_mandir}/man1/gacutil.1*
@@ -236,6 +254,7 @@
 %{_mandir}/man1/setreg.1*
 %{_mandir}/man1/signcode.1*
 %{_mandir}/man1/sn.1*
+%{_mandir}/man1/permview.1*
 %{_mandir}/man5/mono-config.5*
 %dir %{_libdir}/mono
 %dir %{_libdir}/mono/1.0
@@ -257,6 +276,12 @@
 %{_datadir}/jay/skeleton*
 %{_mandir}/man1/jay.1*
 
+# TODO: probably Microsoft.JScript.dll & Co. should be here
+%files jscript
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mjs
+%attr(755,root,root) %{_libdir}/mono/1.0/mjs*
+
 %files compat-links
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/resgen
@@ -278,6 +303,11 @@
 %attr(755,root,root) %{_bindir}/sqlsharp*
 %attr(755,root,root) %{_bindir}/wsdl*
 %attr(755,root,root) %{_bindir}/xsd*
+%attr(755,root,root) %{_bindir}/permview
+%attr(755,root,root) %{_bindir}/dtd2xsd
+%attr(755,root,root) %{_bindir}/macpack
+%attr(755,root,root) %{_bindir}/prj2make
+%attr(755,root,root) %{_bindir}/monodiet
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/mono/1.0/al*
 %attr(755,root,root) %{_libdir}/mono/1.0/cilc*
@@ -295,6 +325,9 @@
 %attr(755,root,root) %{_libdir}/mono/1.0/CorCompare*
 %attr(755,root,root) %{_libdir}/mono/1.0/browsercaps-updater*
 %attr(755,root,root) %{_libdir}/mono/1.0/ictool*
+%attr(755,root,root) %{_libdir}/mono/1.0/permview*
+%attr(755,root,root) %{_libdir}/mono/1.0/dtd2xsd*
+%attr(755,root,root) %{_libdir}/mono/1.0/macpack*
 %{_libdir}/mono/*.*/*.dll.mdb
 %{_libdir}/lib*.la
 %{_datadir}/%{name}
@@ -311,6 +344,9 @@
 %{_mandir}/man1/disco.1*
 %{_mandir}/man1/monop.1*
 %{_mandir}/man1/xsd.1*
+%{_mandir}/man1/dtd2xsd.1*
+%{_mandir}/man1/macpack.1*
+%{_mandir}/man1/prj2make.1*
 
 %files csharp
 %defattr(644,root,root,755)
@@ -341,6 +377,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50.2.5  2005/02/19 10:58:18  malekith
+- update to todays svn trunk version (1.1.4 has an nasty --aot bug)
+- fix license (it's MIT, LGPL or GPL depending on part you're interested
+  in
+- disable icu -- it is deprecated in the main sources now I guess
+- make nptl bcond default on, at least on amd64 it doesn't build without it
+- add install patch instead of a lib64 hack
+
 Revision 1.50.2.4  2005/01/12 23:21:40  malekith
 - now builds find on amd64 with a hack; it should be patched but it's DEVEL 
anyway, and I'm going to report this issue to mono guys
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mono.spec?r1=1.50.2.4&r2=1.50.2.5&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to