New upstream release.
Drop unnecessary spec file elements (BuildRoot, etc.). Drop dependency generation workaround for Fedora 12 and earlier. Remove spurious executable bits on source files. Replace the definition of __ocaml_requires_opts to "-i Sig", which removes the legitimate Requires: ocaml(GtkSignal), with __requires_exclude.
This commit is contained in:
Jerry James
parent
6dc8edb851
commit
256528d223
|
|
@ -1,2 +1 @@
|
|||
ocamlgraph-1.3.tar.gz
|
||||
/ocamlgraph-1.6.tar.gz
|
||||
/ocamlgraph-1.7.tar.gz
|
||||
|
|
|
|||
|
|
@ -12,19 +12,12 @@
|
|||
# follow standard practice.
|
||||
|
||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
%global ocaml_destdir %{_libdir}/ocaml
|
||||
%global debug_package %{nil}
|
||||
# Use new dependency generator in Fedora >= 13
|
||||
%if 0%{?fedora} <= 12
|
||||
%global _use_internal_dependency_generator 0
|
||||
%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
||||
%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
||||
%endif
|
||||
|
||||
%global __ocaml_requires_opts -i Sig
|
||||
|
||||
Name: ocaml-ocamlgraph
|
||||
Version: 1.6
|
||||
Release: 3%{?dist}
|
||||
Version: 1.7
|
||||
Release: 1%{?dist}
|
||||
Summary: OCaml library for arc and node graphs
|
||||
|
||||
Group: Development/Libraries
|
||||
|
|
@ -35,14 +28,18 @@ Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz
|
|||
Source1: ocamlgraph-test.result
|
||||
|
||||
# Fix the install-findlib rule, and install some extras.
|
||||
Patch3: ocamlgraph-1.6-install-extras.patch
|
||||
Patch0: ocamlgraph-1.7-install-extras.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
ExcludeArch: sparc64 s390 s390x
|
||||
BuildRequires: ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: libgnomecanvas-devel
|
||||
BuildRequires: ocaml
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
BuildRequires: gtk2-devel, libgnomecanvas-devel
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
|
||||
ExclusiveArch: %{ocaml_arches}
|
||||
|
||||
%global __requires_exclude ocaml\\\(Sig\\\)
|
||||
|
||||
%description
|
||||
Ocamlgraph provides several different implementations of graph data
|
||||
|
|
@ -69,14 +66,16 @@ developing applications that use %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q -n ocamlgraph-%{version}
|
||||
%patch0
|
||||
|
||||
%patch3 -p1
|
||||
cp -p %{SOURCE1} .
|
||||
|
||||
cp %{SOURCE1} .
|
||||
# Remove spurious executable bits
|
||||
find . -name '*.ml*' -perm /0111 | xargs chmod a-x
|
||||
|
||||
|
||||
%build
|
||||
./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
|
||||
%configure
|
||||
|
||||
%if %opt
|
||||
%global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt
|
||||
|
|
@ -89,13 +88,10 @@ make doc
|
|||
|
||||
%check
|
||||
make --no-print-directory check >& test
|
||||
diff test ocamlgraph-test.result
|
||||
diff -u test ocamlgraph-test.result
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%global ocaml_destdir %{_libdir}/ocaml
|
||||
mkdir -p %{buildroot}%{ocaml_destdir}
|
||||
make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
|
||||
|
||||
|
|
@ -108,12 +104,7 @@ cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examp
|
|||
cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{ocaml_destdir}/ocamlgraph/
|
||||
%if %opt
|
||||
%exclude %{ocaml_destdir}/*/*.a
|
||||
|
|
@ -126,7 +117,6 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%if %opt
|
||||
%{ocaml_destdir}/*/*.a
|
||||
%{ocaml_destdir}/*/*.cmxa
|
||||
|
|
@ -139,6 +129,14 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 11 2011 Jerry James <loganjerry@gmail.com> - 1.7-1
|
||||
- New upstream release
|
||||
- Drop unnecessary spec file elements (BuildRoot, etc.)
|
||||
- Drop dependency generation workaround for Fedora 12 and earlier
|
||||
- Remove spurious executable bits on source files
|
||||
- Replace the definition of __ocaml_requires_opts to "-i Sig", which removes
|
||||
the legitimate Requires: ocaml(GtkSignal), with __requires_exclude.
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- ocamlgraph-1.6.old/Makefile.in 2010-12-13 08:47:38.000000000 +0000
|
||||
+++ ocamlgraph-1.6.fix/Makefile.in 2011-01-10 13:31:34.604320516 +0000
|
||||
@@ -352,7 +352,11 @@
|
||||
--- Makefile.in.orig 2011-02-23 01:35:33.000000000 -0700
|
||||
+++ Makefile.in 2011-07-07 10:34:10.340455498 -0600
|
||||
@@ -349,7 +349,11 @@
|
||||
$(OCAMLFIND) install ocamlgraph META \
|
||||
$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
|
||||
graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
|
||||
Loading…
Reference in New Issue