diff --git a/ocaml.spec b/ocaml.spec index b38129a..d641439 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -27,7 +27,7 @@ Name: ocaml Version: 4.06.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml compiler and programming environment @@ -37,10 +37,6 @@ URL: http://www.ocaml.org Source0: http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-%{version}.tar.xz -Source1: http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-4.06-refman-html.tar.gz -Source2: http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-4.06-refman.pdf -Source3: http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-4.06-refman.info.tar.gz - # IMPORTANT NOTE: # # These patches are generated from unpacked sources stored in a @@ -175,8 +171,7 @@ Requires(preun): /sbin/install-info OCaml is a high-level, strongly-typed, functional and object-oriented programming language from the ML family of languages. -This package contains documentation in PDF and HTML format as well as -man pages and info files. +This package contains man pages. %package compiler-libs @@ -196,9 +191,6 @@ may not be portable between versions. %prep %setup -q -T -b 0 -n %{name}-%{version} -%setup -q -T -D -a 1 -n %{name}-%{version} -%setup -q -T -D -a 3 -n %{name}-%{version} -cp %{SOURCE2} refman.pdf %autopatch -p1 @@ -267,12 +259,6 @@ perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf ) %endif -( - # install info files - mkdir -p $RPM_BUILD_ROOT%{_infodir}; - cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir} -) - echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release # Remove rpaths from stublibs .so files. @@ -288,20 +274,6 @@ find $RPM_BUILD_ROOT -name .ignore -delete find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete -%post docs -/sbin/install-info \ - --entry="* ocaml: (ocaml). The OCaml compiler and programming environment" \ - --section="Programming Languages" \ - %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : - - -%preun docs -if [ $1 -eq 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : -fi - - %files %doc LICENSE %{_bindir}/ocaml @@ -423,8 +395,6 @@ fi %files docs -%doc refman.pdf htmlman -%{_infodir}/* %{_mandir}/man1/* %{_mandir}/man3/* @@ -453,6 +423,9 @@ fi %changelog +* Wed Jan 10 2018 Richard W.M. Jones - 4.06.0-2 +- Drop non-free documentation (RHBZ#1530647). + * Mon Nov 06 2017 Richard W.M. Jones - 4.06.0-1 - New upstream version 4.06.0. - Enable parallel builds again. diff --git a/sources b/sources index d1728b9..64d9535 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ SHA512 (ocaml-4.06.0.tar.xz) = c1cdba3fa52ef03ca534b7a4932cfe29bbbc79b587d35ed7f6906eb09a5e5af97540def03b1e01c63dd2311dc4e5a6d02378d541d14688191e4f9302aff79c23 -SHA512 (ocaml-4.06-refman-html.tar.gz) = 6a9e534a2d7e07650237f5a8bf9b6894fd0f9c32385d272ac53fe32779b4f6d0a623c94e0f92a2351f6614fcebf3d35fdd843752b509341ec1abcaee14f5a0ff -SHA512 (ocaml-4.06-refman.info.tar.gz) = b4665bb44023c6a8ec37b7c5979ffccf97f4f98708073f4e9ed64b61c04455bf0641d191ded3f750d7ed528eea92ad636056016dd87114bd9beab2a78a4503a9 -SHA512 (ocaml-4.06-refman.pdf) = 982e7481bf86620c230d3620cd94d42ea6d432405e33f3642f133448c595c93f3aff3624557b78f96e735f2a94bc59a3885714da70bdbe9a32ce37eed1f2f319