Some fixes to ensure that the SRPM of xapi-libs builds using mock

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>

diff --git a/close-and-exec/Makefile b/close-and-exec/Makefile
index 0834d71d0798320386d23c390da928627e40949c..6760a7cd3e75bf2f89d64470147905b8bd289e22 100644 (file)
--- a/close-and-exec/Makefile
+++ b/close-and-exec/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755 

 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g

diff --git a/forking_executioner/Makefile b/forking_executioner/Makefile
index 7b6584efdc9ec1d6cf9083e59152528af3175954..9856afd49230d3e5ac0366e435cd4e89898ed743 100644 (file)
--- a/forking_executioner/Makefile
+++ b/forking_executioner/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755

 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g


@@ -6,8 +6,8 @@ OCAMLOPT = ocamlopt
 
 LDFLAGS = -cclib -L./
 
 
 LDFLAGS = -cclib -L./
 

-LIBEXEC  = "/opt/xensource/libexec"
-INIT_D   = "/etc/rc.d/init.d"
+LIBEXEC  = /opt/xensource/libexec
+INIT_D   = /etc/rc.d/init.d

 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 

diff --git a/mk/Makefile b/mk/Makefile
index e0b9806f5e6a51ce32dda6b384cb7911bd97b5a9..525b27c16d36fc83b3d993ec41ef44f8b12aa96b 100644 (file)
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -21,7 +21,7 @@ build: srpm $(MY_SOURCES)/MANIFEST
 srpm:
        mkdir -p $(RPM_SRPMSDIR) $(RPM_SPECSDIR) $(RPM_SOURCESDIR) $(RPM_RPMSDIR)
        hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCESDIR)/xapi-libs-0.tar.bz2
 srpm:
        mkdir -p $(RPM_SRPMSDIR) $(RPM_SPECSDIR) $(RPM_SOURCESDIR) $(RPM_RPMSDIR)
        hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCESDIR)/xapi-libs-0.tar.bz2

-       install -o root -g root ../xapi-libs.spec $(RPM_SPECSDIR)
+       install ../xapi-libs.spec $(RPM_SPECSDIR)

        $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs $(RPM_SPECSDIR)/xapi-libs.spec
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
        $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs $(RPM_SPECSDIR)/xapi-libs.spec
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)

diff --git a/pciutil/Makefile b/pciutil/Makefile
index f05b29e2e10c59b3e9246fcf6032e2ca3943ca5a..ac88892e2e3f659aac3d6e0db71d12fb59099a8c 100644 (file)
--- a/pciutil/Makefile
+++ b/pciutil/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755

 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g

diff --git a/sexpr/Makefile b/sexpr/Makefile
index 69db4ee3080a1000a5b6685d97bd41b2c06bfa08..0c562275aa20cf40377612efcdecb3d622ad0b6f 100644 (file)
--- a/sexpr/Makefile
+++ b/sexpr/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755

 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g
 CC = gcc
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
 OCAMLC = ocamlc -g

diff --git a/stdext/Makefile b/stdext/Makefile
index 444bd1942452f6df8c4e41f402d16d23563e5000..596257e6bedd978627c4eda7b253528104b802ad 100644 (file)
--- a/stdext/Makefile
+++ b/stdext/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755

 CC = gcc
 OCAMLLOC := $(shell ocamlc -where)
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(OCAMLLOC)
 CC = gcc
 OCAMLLOC := $(shell ocamlc -where)
 CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(OCAMLLOC)

diff --git a/xapi-libs.spec b/xapi-libs.spec
index 2d36f4804211b63a446cffa1e5f52a72c43566a3..320351f416ab4f2f4a2daec81ab6cd0340b85caa 100644 (file)
--- a/xapi-libs.spec
+++ b/xapi-libs.spec
@@ -11,6 +11,7 @@ License: LGPL+linking exception
 URL:  http://www.xen.org
 Source0: xapi-libs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL:  http://www.xen.org
 Source0: xapi-libs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root

+BuildRequires: ocaml, ocaml-findlib, ocaml-camlp4, ocaml-type-conv, ocaml-getopt, ocaml-xmlm, ocaml-xmlm-devel, autoconf, automake, xen-devel, blktap-devel, e2fsprogs-devel

 
 %description
 The xapi toolstack development libraries and tools.
 
 %description
 The xapi toolstack development libraries and tools.

diff --git a/xml-light2/Makefile b/xml-light2/Makefile
index ee4464683e7b7d16a0e5e857a2560e8deb6a41cc..26e748b55f751dd08dc9bd6ea9a5619e95a8ed98 100644 (file)
--- a/xml-light2/Makefile
+++ b/xml-light2/Makefile
@@ -1,4 +1,4 @@
-IPROG=install -m 755 -o root -g root
+IPROG=install -m 755

 OCAMLPACKS = xmlm
 
 CC = gcc
 OCAMLPACKS = xmlm
 
 CC = gcc