Author: baggins Date: Mon Feb 16 12:18:19 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - no need for external html tgz - cleaned build/install/files
---- Files affected: SPECS: camlp5.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/camlp5.spec diff -u SPECS/camlp5.spec:1.1 SPECS/camlp5.spec:1.2 --- SPECS/camlp5.spec:1.1 Mon Feb 16 13:05:48 2009 +++ SPECS/camlp5.spec Mon Feb 16 13:18:14 2009 @@ -10,8 +10,6 @@ # Source0-md5: 26d69abd669c5fda43dbf35074debc81 Source1: http://pauillac.inria.fr/~ddr/camlp5/doc/pdf/%{name}-%{version}.pdf # Source1-md5: 57cf4eb162568d9b755e8120a1b82d43 -Source2: http://pauillac.inria.fr/~ddr/camlp5/doc/htmlz/%{name}-%{version}.html.tgz -# Source2-md5: fcf3aa4d88a311aa27ff23e50c6f510f URL: http://caml.inria.fr/ BuildRequires: db-devel >= 4.1 Requires: %{name} = %{epoch}:%{version}-%{release} @@ -59,87 +57,31 @@ %prep %setup -q -cp %{SOURCE1} docs/camlp4.pdf -tar xzf %{SOURCE2} +cp %{SOURCE1} doc/camlp4.pdf %build -cp -f /usr/share/automake/config.sub config/gnu ./configure \ - -cc "%{__cc}" \ -bindir %{_bindir} \ - -libdir %{_libdir}/%{name} \ + -libdir %{_libdir}/ocaml \ -mandir %{_mandir}/man1 \ - -host %{_host} \ - %{!?with_tk:-no-tk} \ - -with-pthread \ - -x11lib %{_libdir} + -transitional -%{__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 +%{__make} -j1 world.opt +%{__make} -j1 -C doc/htmlp %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}} -install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/site-lib %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ - LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \ + LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml \ MANDIR=$RPM_BUILD_ROOT%{_mandir} -cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF -%{_libdir}/%{name}/stublibs -%{_libdir}/%{name} -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" -%endif - -# symlink .opt versions of compilers (if present) -# warning: don't do that with camlp4 (can't load extensions then) -for f in ocamlc ocamlopt ocamldoc ocamllex; do - if test -f $RPM_BUILD_ROOT%{_bindir}/$f.opt; then - mv -f $RPM_BUILD_ROOT%{_bindir}/$f \ - $RPM_BUILD_ROOT%{_bindir}/$f.byte - ln -sf %{_bindir}/$f.opt $RPM_BUILD_ROOT%{_bindir}/$f - fi -done - -# move includes to the proper place -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/caml $RPM_BUILD_ROOT%{_includedir}/caml -# but leave compatibility symlink -ln -s ../../include/caml $RPM_BUILD_ROOT%{_libdir}/%{name}/caml - -# compiled sources of compiler, needed by some programs -for f in {asm,byte}comp parsing typing utils ; do - install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f - cp $f/*.{cmi,cmo,cmx,o} $RPM_BUILD_ROOT%{_libdir}/%{name}/compiler/$f -done - -# this isn't installed by default, but is useful -install tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo -cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -cp -r otherlibs/labltk/examples* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version} -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} - -# 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 +for f in camlp5o.opt.1 camlp5r.opt.1 mkcamlp5.1 ocpp5.1 \ + camlp5o.1 camlp5r.1 camlp5sch.1 mkcamlp5.opt.1 ; do + rm -f $RPM_BUILD_ROOT%{_mandir}/man1/$f + echo '.so camlp5.1' >$RPM_BUILD_ROOT%{_mandir}/man1/$f done %clean @@ -147,15 +89,13 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/camlp4* -%attr(755,root,root) %{_bindir}/mkcamlp4 -%{_libdir}/%{name}/camlp4 -%{_mandir}/man1/camlp4*.1* -%{_mandir}/man1/mkcamlp4.1* +%attr(755,root,root) %{_bindir}/* +%{_libdir}/ocaml/%{name} +%{_mandir}/man1/* %files doc-html %defattr(644,root,root,755) -%doc docs/html/camlp4* +%doc doc/html/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -163,6 +103,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2009/02/16 12:18:14 baggins +- no need for external html tgz +- cleaned build/install/files + Revision 1.1 2009/02/16 12:05:48 baggins - initial revision ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/camlp5.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
