[Xen-API] [PATCH 12 of 14] Customise ocaml-type-conv RPM spec file

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1275056363 -3600
# Node ID 347f9a3e24e1d82aa3c186c3139b043ad4939d4c
# Parent  0618c26a1fb3254215c27dbbdca5f8c4407c9a2d
Customise ocaml-type-conv RPM spec file
* set Release to @XEN_RELEASE@

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

diff -r 0618c26a1fb3 -r 347f9a3e24e1 Makefile
--- a/Makefile  Fri May 28 15:19:20 2010 +0100
+++ b/Makefile  Fri May 28 15:19:23 2010 +0100
@@ -30,6 +30,7 @@
 OMAKE_VERSION=0.9.8.5-3
 XMLM_VERSION=1.0.2
 GETOPT_VERSION=20040811
+TYPECONV_VERSION=1.6.8
 
 .PHONY: srpm
 srpm:
@@ -45,6 +46,7 @@
        rpmbuild --nodeps -bs omake.spec
        rpmbuild --nodeps -bs xmlm.spec
        rpmbuild --nodeps -bs getopt.spec
+       rpmbuild --nodeps -bs type-conv.spec
 
 $(MY_OUTPUT_DIR)/ocaml-libs.tar.gz: $(MY_OUTPUT_DIR)/.dirstamp
        $(MAKE) $(foreach c,$(COMPONENTS),install-$(c))
diff -r 0618c26a1fb3 -r 347f9a3e24e1 type-conv.spec
--- a/type-conv.spec    Fri May 28 15:19:20 2010 +0100
+++ b/type-conv.spec    Fri May 28 15:19:23 2010 +0100
@@ -1,19 +1,20 @@
+%define XEN_RELEASE %(test -z "${XEN_RELEASE}" && echo unknown || echo 
$XEN_RELEASE)
+
 Name:           ocaml-type-conv
-Version:        1.6.5
-Release:        %mkrel 1
+Version:        1.6.8
+Release:        %{XEN_RELEASE}
 Summary:        OCaml base library for type conversion
 
 Group:          Development/Other
 License:        LGPLv2+ with exceptions and BSD
 URL:            http://www.ocaml.info/home/ocaml_sources.html#type-conv
-Source0:        
http://hg.ocaml.info/release/type-conv/archive/type-conv-release-%{version}.tar.bz2
+Source0:        
http://hg.ocaml.info/release/type-conv/archive/type-conv-%{version}.tar.bz2
 # curl 
http://hg.ocaml.info/release/type-conv/archive/release-%{version}.tar.bz2 > 
type-conv-release-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib
-BuildRequires:  camlp4
-BuildRequires:  dos2unix
+BuildRequires:  ocaml-camlp4
 
 %description
 The type-conv mini library factors out functionality needed by
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n type-conv-release-%{version}
-dos2unix LICENSE.Tywith
+#dos2unix LICENSE.Tywith
 
 %build
 make
@@ -40,12 +41,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt
+%doc LICENSE LICENSE.Tywith COPYRIGHT README.txt
 %{_libdir}/ocaml/type-conv
 
 
 
 %changelog
+* Fri May 14 2010 David Scott <dave.scott@xxxxxxxxxxxxx>
+- Customised for XCP
+
 * Wed Jan 07 2009 Florent Monnier <blue_prawn@xxxxxxxxxxxx> 1.6.5-1mdv2009.1
 + Revision: 326698
 - corrected group

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