X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=blobdiff_plain;f=ocaml.spec;h=f51ccae402300bad684d255dfb4279598908a2ca;hp=eb7207828460f85f2ce60419dbab1c6243adbc81;hb=11b180b7d7ee3ade45b12413d628ca07044155d4;hpb=4a452533f506852445a212e90b168b8d6bafc9c5

diff --git a/ocaml.spec b/ocaml.spec
index eb72078..f51ccae 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -8,51 +8,48 @@
 %{!?with_x:%undefine	with_tk}
 
 %define		p4ver	3.06
-%define		sver	3.10
+%define		sver	3.12
 
 Summary:	The Objective Caml compiler and programming environment
 Summary(pl.UTF-8):	Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:		ocaml
-Version:	3.10.1
-Release:	1
+Version:	3.12.1
+Release:	18
 Epoch:		1
 License:	distributable
 Group:		Development/Languages
 Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.bz2
-# Source0-md5:	15a8c603b34d466329881285438349ef
+# Source0-md5:	227a3daaedb150bf5037a3db01f5bf42
 Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
-# Source1-md5:	663b31c8ea364a531aa325a5b06a2763
+# Source1-md5:	93cd91f525441eb7e94cc49b9b64bab0
 Source2:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
-# Source2-md5:	69c7acc08ee182c97089fe0736c04e37
-Source3:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.html.tar.gz
-# Source3-md5:	21370bae4e7f6435b38aeb21db7ce8bb
-Source4:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.dvi.gz
-# Source4-md5:	035915d1a530aa7ec9b194d9a7d258eb
-Source5:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.html.tar.gz
-# Source5-md5:	96d8eb4ca5abd58c9a280ba59f73b192
-Source6:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.dvi.gz
-# Source6-md5:	fcd87c235109364242a0c9ccf176dff8
-Source7:	http://www.ocaml.info/ocaml_sources/pure-fun-1.0.6.tar.bz2
-# Source7-md5:	94eac3fa1ac51b8ada344b04839cb43c
-Source8:	http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
-# Source8-md5:	77fa1da7375dea1393cc0b6cd802d7e1
-Source9:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
-# Source9-md5:	f80b52b8bc4b10ed557808fc899acf3a
-Patch0:		%{name}-build.patch
-Patch1:		%{name}-db3.patch
-Patch2:		%{name}-objinfo.patch
-Patch3:		%{name}-tk85support.patch
-Patch4:		%{name}-CFLAGS.patch
-Patch5:		%{name}-as_needed.patch
+# Source2-md5:	a9c17db6ffd400c5ea00c6d51cbf56bf
+Source3:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
+# Source3-md5:	8cf24c4f69c6f9c9f9cc1edb9b18f6cb
+Source4:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.html.tar.gz
+# Source4-md5:	21370bae4e7f6435b38aeb21db7ce8bb
+Source5:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.dvi.gz
+# Source5-md5:	035915d1a530aa7ec9b194d9a7d258eb
+Source6:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.html.tar.gz
+# Source6-md5:	96d8eb4ca5abd58c9a280ba59f73b192
+Source7:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.dvi.gz
+# Source7-md5:	fcd87c235109364242a0c9ccf176dff8
+Source8:	http://www.ocaml.info/ocaml_sources/pure-fun-1.0.6.tar.bz2
+# Source8-md5:	94eac3fa1ac51b8ada344b04839cb43c
+Source9:	http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
+# Source9-md5:	77fa1da7375dea1393cc0b6cd802d7e1
+Patch0:		%{name}-db3.patch
+Patch1:		%{name}-CFLAGS.patch
+Patch2:		%{name}-as_needed.patch
+Patch3:		%{name}-gas.patch
 URL:		http://caml.inria.fr/
 BuildRequires:	db-devel >= 4.1
 %{?with_tk:BuildRequires:	tk-devel}
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 %if %{with emacs}
 BuildRequires:	sed >= 4.0
-BuildRequires:	xemacs
-BuildRequires:	xemacs-common
-BuildRequires:	xemacs-fsf-compat-pkg
+BuildRequires:	emacs
+BuildRequires:	emacs-common
 %endif
 Requires:	%{name}-runtime = %{epoch}:%{version}-%{release}
 Provides:	ocaml-ocamldoc
@@ -307,25 +304,22 @@ Pakiet ten zawiera źródła Czysto Funkcyjnych Struktur Danych
 autorstwa Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
 
 %prep
-%setup -q -a1 -a3 -a5  
+%setup -q -a1 -a3 -a4 -a6
 mkdir examples
-tar xjf %{SOURCE7} -C examples
-tar xzf %{SOURCE8} -C examples
-tar xzf %{SOURCE9}
+tar xjf %{SOURCE8} -C examples
+tar xzf %{SOURCE9} -C examples
 # order mess with docs somewhat
 mkdir -p docs/html
 mv htmlman docs/html/ocaml
 cp %{SOURCE2} docs/ocaml.ps.gz
 mv camlp4-%{p4ver}-manual.html docs/html/camlp4
-cp %{SOURCE4} docs/camlp4.ps.gz
+cp %{SOURCE5} docs/camlp4.ps.gz
 mv camlp4-%{p4ver}-tutorial.html docs/html/camlp4-tutorial
-cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
+cp %{SOURCE7} docs/camlp4-tutorial.ps.gz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -361,10 +355,10 @@ cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
 EOF
 
 %if %{with emacs}
-%{__make} -C emacs DESTDIR=$RPM_BUILD_ROOT install \
-	EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
-	        else echo xemacs; fi`" \
-	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp"
+%{__make} -C emacs install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp" \
+	EMACS="emacs"
 %endif
 
 # symlink .opt versions of compilers (if present)
@@ -395,8 +389,8 @@ cp -r otherlibs/labltk/examples* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%
 ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
 
 # shutup checkfiles
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
+%{__rm} -r $RPM_BUILD_ROOT%{_mandir}/man3
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
 
 # install info pages
 cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
@@ -410,19 +404,20 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post doc-info	-p	/sbin/postshell
+%post	doc-info -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun doc-info	-p	/sbin/postshell
+%postun	doc-info -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc LICENSE Changes README Upgrading
+%attr(755,root,root) %{_bindir}/addlabels
 %attr(755,root,root) %{_bindir}/ocaml*
+%attr(755,root,root) %{_bindir}/scrapelabels
 %{?with_tk:%exclude %{_bindir}/ocamlbrowser}
 %exclude %{_bindir}/ocamlrun
-%attr(755,root,root) %{_bindir}/*labels
 %{_includedir}/caml
 %{_libdir}/%{name}/caml
 %{_libdir}/%{name}/threads
@@ -442,8 +437,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/ocamldoc/*.hva
 %attr(755,root,root) %{_libdir}/%{name}/expunge
 %attr(755,root,root) %{_libdir}/%{name}/extract_crc
-%attr(755,root,root) %{_libdir}/%{name}/*labels
-%{_mandir}/man1/*ocaml*
+%attr(755,root,root) %{_libdir}/%{name}/objinfo_helper
+%{_mandir}/man1/ocaml*
+%exclude %{_mandir}/man1/ocamlrun.1*
 
 %files runtime
 %defattr(644,root,root,755)
@@ -453,10 +449,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/stublibs
 %attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.so
 %exclude %{_libdir}/%{name}/stublibs/dllgraphics.so
+%attr(755,root,root) %{_libdir}/%{name}/libcamlrun_shared.so
 %if %{with tk}
 %exclude %{_libdir}/%{name}/stublibs/dlllabltk.so
-%exclude %{_libdir}/%{name}/stublibs/dlltkanim.so
 %endif
+%{_mandir}/man1/ocamlrun.1*
 
 %files lib-source
 %defattr(644,root,root,755)
@@ -490,7 +487,6 @@ rm -rf $RPM_BUILD_ROOT
 %files labltk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlltkanim.so
 
 %files labltk-devel
 %defattr(644,root,root,755)
@@ -499,6 +495,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/labltk
 %{_libdir}/%{name}/labltk/*.cm*
 %{_libdir}/%{name}/labltk/*.a
+%{_libdir}/%{name}/labltk/*.o
 %attr(755,root,root) %{_libdir}/%{name}/labltk/tkcompiler
 %{_examplesdir}/%{name}-labltk-%{version}
 %endif