[packages/libxenserver] - more fixes in make patch (install proper headers, only exaples require curl) - release 2

[qboosh]

commit 85c660bdecafbac07d35b19aff55f8c3c82e5335
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 12 17:30:31 2012 +0200

    - more fixes in make patch (install proper headers, only exaples require curl)
    - release 2

 libxenserver-make.patch | 24 +++++++++++++++++++++++-
 libxenserver.spec       |  5 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/libxenserver-make.patch b/libxenserver-make.patch
index bc23192..aef4ece 100644
--- a/libxenserver-make.patch
+++ b/libxenserver-make.patch
@@ -1,5 +1,27 @@
 --- libxenserver/Makefile.orig	2011-09-21 17:13:22.000000000 +0200
 +++ libxenserver/Makefile	2012-07-11 20:29:31.885727725 +0200
+@@ -24,9 +24,9 @@
+          $(shell curl-config --cflags) \
+          -W -Wall -Wmissing-prototypes -Werror -std=c99 -fPIC
+ 
+-LDFLAGS = -g $(shell xml2-config --libs) \
+-          $(shell curl-config --libs) \
+-	  -Wl,-rpath,$(shell pwd)
++LDFLAGS = -g
++LIBS = $(shell xml2-config --libs)
++PROG_LIBS = $(LIBS) $(shell curl-config --libs)
+ 
+ # -h for Solaris
+ SONAME_LDFLAG ?= -soname
+@@ -38,7 +38,7 @@
+ INSTALL_DIR  = $(INSTALL) -d -m0755 -p
+ INSTALL_DATA = $(INSTALL) -m0644 -p
+ 
+-LIBXENAPI_HDRS = $(wildcard include/*.h)
++LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h)
+ LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c))
+ 
+ TEST_PROGRAMS = test/test_vm_ops test/test_event_handling \
 @@ -56,13 +56,13 @@
  	ln -sf $< $@
  
@@ -12,7 +34,7 @@
  
  $(TEST_PROGRAMS): test/%: test/%.o libxenserver.so
 -	$(CC) $(LDFLAGS) -o $@ $< -L . -lxenserver
-+	$(CC) $(LDFLAGS) -o $@ $< -L . -lxenserver $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $< -L . -lxenserver $(PROG_LIBS)
  
  
  .PHONY: install
diff --git a/libxenserver.spec b/libxenserver.spec
index e51b9c7..ac73499 100644
--- a/libxenserver.spec
+++ b/libxenserver.spec
@@ -2,7 +2,7 @@ Summary:	An SDK for Citrix XenServer, exposing the XenServer API
 Summary(pl.UTF-8):	SDK dla Citrix XenServera, udostępniające API XenServer
 Name:		libxenserver
 Version:	6.0.0
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 # http://community.citrix.com/display/xs/Download+SDKs
@@ -59,8 +59,7 @@ Statyczna biblioteka libxenserver.
 %{__make} all libxenserver.a \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Iinclude $(xml2-config --cflags) $(curl-config --cflags) -W -Wall -std=c99 -fPIC" \
-	LDFLAGS="%{rpmldflags}" \
-	LIBS="$(xml2-config --libs) $(curl-config --libs)"
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT