X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=blobdiff_plain;f=ocaml.spec;h=8b9dc269e68cda4732ef9cc6fe9e19a9ff0e675b;hp=28a78290baaf711b079fcfd896a9cdd3269c7142;hb=9368eba84b38ba73cb7b9988ac930b17a2b83f33;hpb=7ff0f82f6d3e2fcfd246fdf98b5a5fb93ed662ec

diff --git a/ocaml.spec b/ocaml.spec
index 28a7829..8b9dc26 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -13,14 +13,13 @@
 Summary:	The Objective Caml compiler and programming environment
 Summary(pl.UTF-8):	Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:		ocaml
-Version:	3.10.0
+Version:	3.10.2
 Release:	1
 Epoch:		1
 License:	distributable
-Vendor:		Group of implementors <caml-light@inria.fr>
 Group:		Development/Languages
 Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.bz2
-# Source0-md5:	5b14fe7ef863ab8295c9b7d428d5e93c
+# Source0-md5:	d86f8f8aa4574fa60dd6f89044580307
 Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
 # Source1-md5:	663b31c8ea364a531aa325a5b06a2763
 Source2:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
@@ -343,6 +342,9 @@ cp -f /usr/share/automake/config.sub config/gnu
 %{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
 %{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
 
+# broken build system
+sed -e 's,LIBDIR,%{_libdir},' camlp4/man/camlp4.1.tpl > camlp4/man/camlp4.1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
@@ -399,20 +401,26 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
 # install info pages
 cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
 
+# broken build system
+install camlp4/man/camlp4.1 $RPM_BUILD_ROOT%{_mandir}/man1
+for f in camlp4o.1 camlp4r.1 mkcamlp4.1 camlp4o.opt.1 camlp4r.opt.1 ; do
+	echo '.so camlp4.1' >$RPM_BUILD_ROOT%{_mandir}/man1/$f
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post doc-info
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post doc-info	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun doc-info
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%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}/ocaml*
-%{!?_without_tk:%exclude %{_bindir}/ocamlbrowser}
+%{?with_tk:%exclude %{_bindir}/ocamlbrowser}
 %exclude %{_bindir}/ocamlrun
 %attr(755,root,root) %{_bindir}/*labels
 %{_includedir}/caml
@@ -425,6 +433,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.o
 %{_libdir}/%{name}/*.cm*
 %exclude %{_libdir}/%{name}/*graphics*
+%{_libdir}/%{name}/Makefile.config
 %{_libdir}/%{name}/ld.conf
 %{_libdir}/%{name}/camlheader
 %{_libdir}/%{name}/camlheader_ur
@@ -508,13 +517,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files camlp4
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*camlp4*
-#%attr(755,root,root) %{_bindir}/ocpp
-# Not installed since 3.05, is it needed?
-#%attr(755,root,root) %{_bindir}/odyl
+%attr(755,root,root) %{_bindir}/camlp4*
+%attr(755,root,root) %{_bindir}/mkcamlp4
 %{_libdir}/%{name}/camlp4
-#%{_mandir}/man*/*camlp4*
-#%{_mandir}/man*/*ocpp*
+%{_mandir}/man1/camlp4*.1*
+%{_mandir}/man1/mkcamlp4.1*
 
 %files camlp4-doc-html
 %defattr(644,root,root,755)