rpms/ocaml-cmigrep/devel cmigrep-make-without-godi-debian.patch, NONE, 1.1 import.log, NONE, 1.1 ocaml-cmigrep.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cmigrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23640/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cmigrep-make-without-godi-debian.patch import.log 
	ocaml-cmigrep.spec 
Log Message:
Initial import.


cmigrep-make-without-godi-debian.patch:

--- NEW FILE cmigrep-make-without-godi-debian.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01make-without-godi.dpatch by Ralf Treinen <treinen at debian.org>
##
## DP: Compile without godi. Provide directly the include directories for
## DP: the compiler-libs.

@DPATCH@
diff -urNad trunk~/Makefile trunk/Makefile
--- trunk~/Makefile	2007-04-01 16:43:39.000000000 +0200
+++ trunk/Makefile	2007-07-07 10:18:23.000000000 +0200
@@ -16,17 +16,15 @@
 includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
 typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
 
-
-GODI_CONF=$(shell godi_confdir)
-GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
-GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
+COMPILERLIBFLAGS=-I compiler/parsing -I compiler/typing     \
+-I compiler/utils
 
 all:
-	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
+	ocamlfind ocamlopt -o cmigrep $(COMPILERLIBFLAGS) \
 	-package pcre,findlib,unix -linkpkg $(SOURCES)
 
 byte:
-	ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \
+	ocamlfind ocamlc -o cmigrep $(COMPILERLIBFLAGS) \
 	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
 
 install:


--- NEW FILE import.log ---
ocaml-cmigrep-1_5-1_fc9:HEAD:ocaml-cmigrep-1.5-1.fc9.src.rpm:1219698468


--- NEW FILE ocaml-cmigrep.spec ---
%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%define debug_package %{nil}

%define ocaml_major 3.10
%define ocaml_minor 2

Name:           ocaml-cmigrep
Version:        1.5
Release:        1%{?dist}
Summary:        Search OCaml compiled interface (cmi) files

Group:          Development/Libraries
License:        GPLv2+
URL:            http://homepage.mac.com/letaris/
Source0:        http://homepage.mac.com/letaris/cmigrep-1.5.tar.bz2
Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Patch0:         cmigrep-make-without-godi-debian.patch

BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
BuildRequires:  ocaml-findlib-devel
BuildRequires:  ocaml-pcre-devel
BuildRequires:  ocaml-ocamldoc

%define _use_internal_dependency_generator 0
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh


%description
A utility to mine the data in Caml compiled interface (cmi) files, and
elisp that allows emacs to use cmigrep for completion.


%prep
%setup -q -n cmigrep-%{version}
%patch0 -p1

# Unpack OCaml sources into compiler/ subdirectory.
# XXX On Debian the compiled compiler libs are shipped in a
# +compiler-libs directory.  It would be good to copy this,
# however in Debian the only packages which actually use
# compiler-libs are camlp5 & cmigrep.
bzcat %{SOURCE1} | tar xf -
mv ocaml-%{ocaml_major}.%{ocaml_minor} compiler


%build
# Build the compiler libs.
pushd compiler
CFLAGS="$RPM_OPT_FLAGS" ./configure \
    -bindir %{_bindir} \
    -libdir %{_libdir}/ocaml \
    -x11lib %{_libdir} \
    -x11include %{_includedir} \
    -mandir %{_mandir}/man1
make world
%if %opt
make opt.opt
%endif
popd

# Build cmigrep itself.
make byte
%if %opt
make all
%endif

strip cmigrep


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 0755 cmigrep $RPM_BUILD_ROOT%{_bindir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc GPL README cmigrep.el
%{_bindir}/cmigrep


%changelog
* Mon Apr 28 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5-1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Aug 2008 19:56:41 -0000	1.1
+++ .cvsignore	25 Aug 2008 21:08:05 -0000	1.2
@@ -0,0 +1,2 @@
+cmigrep-1.5.tar.bz2
+ocaml-3.10.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Aug 2008 19:56:41 -0000	1.1
+++ sources	25 Aug 2008 21:08:05 -0000	1.2
@@ -0,0 +1,2 @@
+869ba6758a773c4218461f14f6ebcb4e  cmigrep-1.5.tar.bz2
+d86f8f8aa4574fa60dd6f89044580307  ocaml-3.10.2.tar.bz2