>From 6d505cbaa76298dc85b0299a2090b6aaf8f7b9fe Mon Sep 17 00:00:00 2001
From: Magnus Therning <magnus@xxxxxxxxxxxx>
Date: Tue, 14 Dec 2010 17:00:08 +0000
Subject: [PATCH 1/3] rpmbuild, step one.
To: magnus+silly@xxxxxxxxxxxx

Signed-off-by: Magnus Therning <magnus@xxxxxxxxxxxx>
---
 Makefile.xcp           |   23 +++++++++++++++++++++++
 ocaml/lvhdrt/OMakefile |    2 +-
 xapi.spec              |    4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Makefile.xcp b/Makefile.xcp
new file mode 100644
index 0000000..146489f
--- /dev/null
+++ b/Makefile.xcp
@@ -0,0 +1,23 @@
+ifdef B_BASE
+include $(B_BASE)/common.mk
+REPO=$(call hg_loc,xen-api)
+else
+MY_OUTPUT_DIR ?= $(CURDIR)/output
+MY_OBJ_DIR ?= $(CURDIR)/obj
+REPO ?= $(CURDIR)
+
+RPM_SPECSDIR?=/usr/src/redhat/SPECS
+RPM_SRPMSDIR?=/usr/src/redhat/SRPMS
+RPM_SOURCEDIR?=/usr/src/redhat/SOURCES
+XEN_RELEASE?=unknown
+endif
+
+
+.PHONY: srpm
+srpm:
+	git archive --format=tar --prefix=xapi-0.2/ HEAD | bzip2 > $(RPM_SOURCEDIR)/xapi-0.2.tar.bz2
+	rpmbuild --define "XEN_RELEASE $(XEN_RELEASE)" -bs --nodeps xapi.spec
+
+.PHONY: rpm
+rpm:
+	rpmbuild -bb xapi.spec
diff --git a/ocaml/lvhdrt/OMakefile b/ocaml/lvhdrt/OMakefile
index c8230cb..7c4442e 100644
--- a/ocaml/lvhdrt/OMakefile
+++ b/ocaml/lvhdrt/OMakefile
@@ -2,7 +2,7 @@ OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend
 OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr log
 
-IEXE=install -m 755 -o root -g root
+IEXE=install -D -m 755 -o root -g root
 
 OCamlProgram(lvhdrt, lvhdrt lvhdrt_exceptions utils globs fists tc_8670 tc_8682 tc_8699 tc_8700 tc_8707 tc_8713 tc_8766 tc_8775)
 
diff --git a/xapi.spec b/xapi.spec
index f2586f5..80a0290 100644
--- a/xapi.spec
+++ b/xapi.spec
@@ -10,7 +10,7 @@ Group:   System/Hypervisor
 License: LGPL+linking exception
 URL:  http://www.xen.org
 Source0: xapi-%{version}.tar.bz2
-Patch0: xapi-version.patch
+#Patch0: xapi-version.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pam-devel tetex xapi-libs-devel ocaml omake ocaml-findlib ocaml-xmlm
 
@@ -84,7 +84,7 @@ This package contains Xen-API documentation and examples in several programming
 
 %prep 
 %setup -q
-%patch0 -p0 -b xapi-version.patch
+#%patch0 -p0 -b xapi-version.patch
 
 %build
 COMPILE_JAVA=no %{__make}
-- 
1.7.3.5