update: ocaml, facile

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3717 ec354946-7b23-47d6-9f5a-488ba84defc7

f/facile/facile-vl.spec

@@ -1,15 +1,24 @@
-Summary: Functional Constraint Library implemented in Objective Caml
 Name: facile
+Summary: Functional Constraint Library implemented in Objective Caml
+Summary(ja): OCaml で実装された関数制約ライブラリ
 Version: 1.1
-Release: 10%{?_dist_release}
+Release: 11%{?_dist_release}
+
 License: LGPL
 Group: System Environment/Libraries
-Source: http://www.recherche.enac.fr/opti/facile/distrib/%{name}-%{version}.tar.gz
 URL: http://www.recherche.enac.fr/opti/facile/
+
+Source: http://www.recherche.enac.fr/opti/facile/distrib/%{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ocaml >= 3.02
 Requires: ocaml >= 3.02
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
+Packager: inagaki
+
 %description
 FaCiLe is a constraint programming library on integer and integer set 
 finite domains written in OCaml. It offers all usual facilities to create and 
@@ -56,6 +65,11 @@ make check
 %{_libdir}/ocaml/facile/*
 
 %changelog
+* Wed Apr 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.1-11
+- rebuilt with ocaml-3.12.0
+- added Japanese summary
+- added Vendor and Distribution tag
+
 * Sun Sep 13 2009 NAKAMURA Kenta <kenta@vinelinux.org> 1.1-10
 - rebuilt with ocaml-3.11.0 (x86_64 has not built with ocaml-3.11.0)
 

o/ocaml/ocaml-vl.spec

@@ -1,12 +1,12 @@
 Name: ocaml
 Summary: The Objective Caml compiler and programming environment
 Summary(ja): Objective Caml コンパイラとプログラミング環境
-Version: 3.11.0
-Release: 2%{?_dist_release}
+Version: 3.12.0
+Release: 1%{?_dist_release}
 Source0: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-%{version}.tar.bz2
-Source1: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.html.tar.gz
-Source2: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.ps.gz
-Source3: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.10-refman.info.tar.gz
+Source1: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.12-refman.html.tar.gz
+Source2: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.12-refman.ps.gz
+Source3: http://caml.inria.fr/distrib/ocaml-3.10/ocaml-3.12-refman.info.tar.gz
 Source4: ocaml-info-entry
 
 # Vine Source(s)
@@ -21,7 +21,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel gdbm-devel emacsen
 BuildRequires: libX11-devel
 BuildRequires: tk tcl expect thread 
-Requires(post,preun): install-info
+Requires(post): install-info
+Requires(preun): install-info
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -75,7 +76,8 @@ Summary: Emacs mode for Objective Caml
 Summary(ja): Objective Caml の Emacs mode
 Group: Applications/Editors/Emacs
 Requires: ocaml = %{version}-%{release}
-Prereq: emacs, emacsen-common
+Requires(post): emacs, emacsen-common
+Requires(preun): emacs, emacsen-common
 Obsoletes: ocaml-emacs <= %{version}
 
 %description mode
@@ -106,22 +108,22 @@ make world opt opt.opt
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install BINDIR=%{buildroot}%{_bindir} LIBDIR=%{buildroot}%{_libdir}/ocaml MANDIR=%{buildroot}%{_mandir}
+make install BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml MANDIR=$RPM_BUILD_ROOT%{_mandir}
 
-mv %{buildroot}%{_libdir}/ocaml/ld.conf %{buildroot}%{_libdir}/ocaml/ld.conf.orig
-sed -e "s|^%{buildroot}||" %{buildroot}%{_libdir}/ocaml/ld.conf.orig > %{buildroot}%{_libdir}/ocaml/ld.conf
-rm -f %{buildroot}%{_libdir}/ocaml/ld.conf.orig
-(mkdir -p %{buildroot}%{_infodir}; cd infoman; cp ocaml*.gz %{buildroot}%{_infodir})
+mv $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf.orig
+sed -e "s|^%{buildroot}||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf.orig > $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
+rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf.orig
+(mkdir -p $RPM_BUILD_ROOT%{_infodir}; cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir})
 # for dumpobj, objinfo
-(cd tools; install dumpobj objinfo %{buildroot}%{_bindir}) 
+(cd tools; install dumpobj objinfo $RPM_BUILD_ROOT%{_bindir}) 
 
 # for Emacs Lisp
-make -C emacs install install-ocamltags BINDIR=%{buildroot}%{_bindir} \
-    EMACSDIR=%{buildroot}%{_datadir}/emacs/site-lisp/caml-mode
+make -C emacs install install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+    EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/caml-mode
 
 # emacsen-common-ize
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/emacsen-common/packages/install
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/emacsen-common/packages/remove
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/emacsen-common/packages/install
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/emacsen-common/packages/remove
 %_installemacsenscript caml-mode %{SOURCE10}
 
 %_removeemacsenscript  caml-mode %{SOURCE11}
@@ -174,17 +176,12 @@ fi
 ### in ocaml-camlp4
 %exclude %{_bindir}/camlp4*
 %exclude %{_bindir}/mkcamlp4
-#exclude %{_bindir}/ocpp
 %exclude %{_libdir}/ocaml/camlp4/
-#exclude %{_mandir}/man1/camlp4*
-#exclude %{_mandir}/man1/mkcamlp4*
-#exclude %{_mandir}/man1/ocpp*
 ### in ocaml-labltk
 %exclude %{_bindir}/labltk
 %exclude %{_bindir}/ocamlbrowser
 %exclude %{_libdir}/ocaml/labltk/
 %exclude %{_libdir}/ocaml/stublibs/dlllabltk.so
-%exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
 ### in ocaml-mode
 %exclude %{_bindir}/ocamltags
 
@@ -192,12 +189,8 @@ fi
 %defattr(-, root, root, 0755)
 %{_bindir}/camlp4*
 %{_bindir}/mkcamlp4
-#{_bindir}/ocpp
 %dir %{_libdir}/ocaml/
 %{_libdir}/ocaml/camlp4/
-#{_mandir}/man1/camlp4*
-#{_mandir}/man1/mkcamlp4*
-#{_mandir}/man1/ocpp*
 
 %files labltk
 %defattr(-, root, root, 0755)
@@ -208,7 +201,6 @@ fi
 %dir %{_libdir}/ocaml/stublibs/
 %{_libdir}/ocaml/labltk/
 %{_libdir}/ocaml/stublibs/dlllabltk.so
-%{_libdir}/ocaml/stublibs/dlltkanim.so
 
 %files mode
 %defattr(-, root, root, 0755)
@@ -223,6 +215,9 @@ fi
 
 
 %changelog
+* Wed Apr 27 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.12.0-1
+- new upstream release 
+
 * Fri Apr 16 2010 Shu KONNO <owa@bg.wakwak.com> 3.11.0-2
 - rebuilt with new tool chain