From b5dddefdc2af8b6483c3dd794e619958d2395c0b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 6 Aug 2013 09:12:38 -0600 Subject: [PATCH] Adapt to Rawhide unversioned docdir change (bz 994002). --- ocaml-ocamlgraph.spec | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec index 8be1342..9cd338d 100644 --- a/ocaml-ocamlgraph.spec +++ b/ocaml-ocamlgraph.spec @@ -17,7 +17,7 @@ Name: ocaml-ocamlgraph Version: 1.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for arc and node graphs Group: Development/Libraries @@ -102,16 +102,14 @@ diff -u test ocamlgraph-test.result mkdir -p %{buildroot}%{ocaml_destdir} make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/ -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ -cp -p COPYING CREDITS FAQ LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ -cp -p CHANGES README %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/ -cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examples/ -cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ - +# Include all code and examples in the docs +mkdir -p dox-devel/examples +mkdir -p dox-devel/API +cp -p examples/*.ml dox-devel/examples +cp -p doc/* dox-devel/API %files +%doc COPYING CREDITS FAQ LICENSE %{ocaml_destdir}/ocamlgraph/ %if %opt %exclude %{ocaml_destdir}/*/*.a @@ -120,10 +118,10 @@ cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ %exclude %{ocaml_destdir}/*/*.o %endif %exclude %{ocaml_destdir}/*/*.mli -%{_defaultdocdir}/%{name}-%{version}/ %files devel +%doc CHANGES README dox-devel/* %if %opt %{ocaml_destdir}/*/*.a %{ocaml_destdir}/*/*.cmxa @@ -131,11 +129,12 @@ cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ %{ocaml_destdir}/*/*.o %endif %{ocaml_destdir}/*/*.mli -# Include all code and examples in the doc directory -%{_defaultdocdir}/%{name}-%{version}-devel/ %changelog +* Tue Aug 6 2013 Jerry James - 1.8.3-3 +- Adapt to Rawhide unversioned docdir change (bz 994002) + * Sat Aug 03 2013 Fedora Release Engineering - 1.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild