Drop non-free documentation (RHBZ#1530647).

(cherry picked from commit e65cf15d35)
This commit is contained in:
Richard W.M. Jones 2018-01-10 14:25:12 +00:00
parent 7a76b44f15
commit 94f98cd258
2 changed files with 5 additions and 35 deletions

View File

@ -27,7 +27,7 @@
Name: ocaml
Version: 4.04.0
Release: 10%{?dist}
Release: 11%{?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.04/ocaml-%{version}.tar.gz
Source1: http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman-html.tar.gz
Source2: http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman.pdf
Source3: http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman.info.tar.gz
# IMPORTANT NOTE:
#
# These patches are generated from unpacked sources stored in a
@ -182,8 +178,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
@ -203,9 +198,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
@ -274,12 +266,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.
@ -295,20 +281,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
@ -429,8 +401,6 @@ fi
%files docs
%doc refman.pdf htmlman
%{_infodir}/*
%{_mandir}/man1/*
%{_mandir}/man3/*
@ -458,6 +428,9 @@ fi
%changelog
* Wed Jan 10 2018 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-11
- Drop non-free documentation (RHBZ#1530647).
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 4.04.0-10
- Fix: ocaml: Insufficient sanitisation allows privilege escalation for
setuid binaries (CVE-2017-9772) (RHBZ#1464920).

View File

@ -1,4 +1 @@
496f99822133bb905171bae8f64b7be4 ocaml-4.04.0.tar.gz
5c58a4fce99b20e02c3208ad956bcb9d ocaml-4.04-refman-html.tar.gz
8c9df1da0e36a69817f43115fa87360c ocaml-4.04-refman.info.tar.gz
69342c456bcc7ef1c3a76cca1e9c0ec8 ocaml-4.04-refman.pdf