Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
809ed13caa | ||
|
058e6a1414 | ||
|
0f3f882f83 | ||
|
a435795c8f | ||
|
54f742a75b |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: ocaml-findlib
|
||||
# $Id$
|
||||
NAME := ocaml-findlib
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
@ -1,11 +0,0 @@
|
||||
--- findlib-1.1.2pl1/src/findlib/Makefile.orig 2007-08-02 13:25:46.000000000 +0100
|
||||
+++ findlib-1.1.2pl1/src/findlib/Makefile 2007-08-02 13:25:25.000000000 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
OCAMLOPT = ocamlopt
|
||||
OCAMLDEP = ocamldep
|
||||
OCAMLLEX = ocamllex
|
||||
-CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
|
||||
+CAMLP4O = camlp4 -I `ocamlc -where`/camlp4/Camlp4Parsers/ pa_o.cmo pa_op.cmo pr_o.cmo --
|
||||
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo --
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
Name: ocaml-findlib
|
||||
Version: 1.1.2pl1
|
||||
Release: 14%{?dist}
|
||||
Release: 16%{?dist}
|
||||
Summary: Objective CAML package manager and build helper
|
||||
|
||||
Group: Development/Libraries
|
||||
@ -13,19 +13,13 @@ Source0: http://www.ocaml-programming.de/packages/findlib-1.1.2pl1.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
ExcludeArch: ppc64
|
||||
|
||||
Patch0: findlib-camlp4-path.patch
|
||||
|
||||
BuildRequires: ocaml >= 3.10.0-6
|
||||
BuildRequires: ocaml-camlp4-devel
|
||||
BuildRequires: ocaml-labltk-devel
|
||||
BuildRequires: ocaml >= 3.09.3
|
||||
BuildRequires: camlp4
|
||||
BuildRequires: labltk
|
||||
BuildRequires: ocaml-ocamldoc
|
||||
BuildRequires: m4, ncurses-devel
|
||||
BuildRequires: gawk
|
||||
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
|
||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
||||
|
||||
%description
|
||||
Objective CAML package manager and build helper.
|
||||
|
||||
@ -43,7 +37,6 @@ developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n findlib-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
@ -110,6 +103,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 8 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-16
|
||||
- Removed paths patch, not necessary with camlp4 3.09.
|
||||
|
||||
* Thu Nov 8 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-15
|
||||
- Rebuild for EPEL.
|
||||
|
||||
* Thu Sep 6 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-14
|
||||
- Ignore Parsetree module, it's a part of the toplevel.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user