[Xen-API] [PATCH 04 of 14] Customise ocaml-findlib RPM spec file

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1275056245 -3600
# Node ID 802172ba9d3315fd56d3f8ff8e4159bc0977e238
# Parent  1a8747ee6e7aeee4e2812e9b26e9da9c67b4d5c1
Customise ocaml-findlib RPM spec file
* set Release to @XEN_RELEASE@
* exclude tk stuff

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 1a8747ee6e7a -r 802172ba9d33 Makefile
--- a/Makefile  Fri May 28 15:17:20 2010 +0100
+++ b/Makefile  Fri May 28 15:17:25 2010 +0100
@@ -26,12 +26,14 @@
        @ :
 
 OCAML_VERSION=3.11.0
+FINDLIB_VERSION=1.1.2pl1
 
 .PHONY: srpm
 srpm:
        cp $(CARBON_DISTFILES)/ocaml-${OCAML_VERSION}.tar.bz2 $(RPM_SOURCEDIR)/
+       cp $(CARBON_DISTFILES)/findlib-${FINDLIB_VERSION}.tar.gz 
$(RPM_SOURCEDIR)/
        rpmbuild -bs ocaml.spec
-
+       rpmbuild --nodeps -bs findlib.spec
 
 $(MY_OUTPUT_DIR)/ocaml-libs.tar.gz: $(MY_OUTPUT_DIR)/.dirstamp
        $(MAKE) $(foreach c,$(COMPONENTS),install-$(c))
diff -r 1a8747ee6e7a -r 802172ba9d33 findlib.spec
--- a/findlib.spec      Fri May 28 15:17:20 2010 +0100
+++ b/findlib.spec      Fri May 28 15:17:25 2010 +0100
@@ -1,9 +1,11 @@
+%define XEN_RELEASE %(test -z "${XEN_RELEASE}" && echo unknown || echo 
$XEN_RELEASE)
+
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
 Name:           ocaml-findlib
-Version:        1.2.1
-Release:        5%{?dist}
+Version:        1.1.2pl1
+Release:        %{XEN_RELEASE}
 Summary:        Objective CAML package manager and build helper
 
 Group:          Development/Libraries
@@ -12,10 +14,8 @@
 Source0:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ocaml >= 3.09.2
-BuildRequires:  camlp4
-BuildRequires:  labltk
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml
+BuildRequires:  ocaml-camlp4
 BuildRequires:  m4, ncurses-devel
 BuildRequires:  gawk
 
@@ -83,8 +83,6 @@
 %endif
 %exclude %{_libdir}/ocaml/findlib/*.mli
 %exclude %{_libdir}/ocaml/findlib/Makefile.config
-%exclude %{_libdir}/ocaml/findlib/make_wizard
-%exclude %{_libdir}/ocaml/findlib/make_wizard.pattern
 %{_libdir}/ocaml/num-top
 
 
@@ -97,11 +95,12 @@
 %endif
 %{_libdir}/ocaml/findlib/*.mli
 %{_libdir}/ocaml/findlib/Makefile.config
-%{_libdir}/ocaml/findlib/make_wizard
-%{_libdir}/ocaml/findlib/make_wizard.pattern
 
 
 %changelog
+* Fri May 14 2010 David Scott <dave.scott@xxxxxxxxxxxxx>
+- Customised for XCP
+
 * Thu Apr 24 2008 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1.2.1-5
 - Removed dependency generation for EL-4.
 - ocaml-camlp4 -> camlp4, ocaml-labltk -> labltk for this ancient
@@ -162,4 +161,3 @@
 
 * Fri May 18 2007 Richard W.M. Jones <rjones@xxxxxxxxxx> - 1.1.2pl1-1
 - Initial RPM release.
-

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api