[packages/libxenserver] - new URLs, updated to 6.4.0 SP1 (note: new sonames) - updated make patch
qboosh
qboosh at pld-linux.org
Mon Oct 26 16:29:06 CET 2015
commit c20a75afc8910c4ff05771bb1f5fa862b9689735
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Oct 26 16:29:01 2015 +0100
- new URLs, updated to 6.4.0 SP1 (note: new sonames)
- updated make patch
libxenserver-make.patch | 62 ++++++++++++++++++++++++++++++++++---------------
libxenserver.spec | 32 ++++++++++++++-----------
2 files changed, 61 insertions(+), 33 deletions(-)
---
diff --git a/libxenserver.spec b/libxenserver.spec
index a6fa242..861c697 100644
--- a/libxenserver.spec
+++ b/libxenserver.spec
@@ -1,15 +1,16 @@
+# TODO: C#(?), Java, Python
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: 3
-License: LGPL v2.1+
+Version: 6.5.0.SP1
+Release: 1
+License: BSD
Group: Libraries
-# http://community.citrix.com/display/xs/Download+SDKs
-Source0: http://community.citrix.com/download/attachments/38633496/%{name}-%{version}-1-src.tar.bz2
-# Source0-md5: 27faa9249092ad823cef3c3850240a21
+#Source0Download: http://xenserver.org/partners/developing-products-for-xenserver.html
+Source0: http://downloadns.citrix.com.edgesuite.net/10342/XenServer-6.5.0-SP1-SDK.zip
+# Source0-md5: 795709a8639b5ba4849f322c8fe7d4dd
Patch0: %{name}-make.patch
-URL: http://community.citrix.com/display/xs/Home
+URL: http://xenserver.org/partners/developing-products-for-xenserver.html
BuildRequires: curl-devel
BuildRequires: libxml2-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,11 +53,14 @@ Statyczna biblioteka libxenserver.
%prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n XenServer-SDK
+%patch0 -p0
+
+# precompiled binaries
+%{__rm} libxenserver/bin/*
%build
-%{__make} all libxenserver.a \
+%{__make} -C libxenserver/src all libxenserver.a \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -Iinclude $(xml2-config --cflags) $(curl-config --cflags) -W -Wall -std=c99 -fPIC" \
LDFLAGS="%{rpmldflags}"
@@ -64,11 +68,11 @@ Statyczna biblioteka libxenserver.
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C libxenserver/src install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p" \
INSTALL_PROG="%{__install} -p -m755" \
- LIBDIR="%{_lib}"
+ LIBDIR=%{_libdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -78,9 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
+%doc libxenserver/{COPYING,README}
%attr(755,root,root) %{_libdir}/libxenserver.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenserver.so.1
+%attr(755,root,root) %ghost %{_libdir}/libxenserver.so.2
%files devel
%defattr(644,root,root,755)
diff --git a/libxenserver-make.patch b/libxenserver-make.patch
index aef4ece..1e485f3 100644
--- a/libxenserver-make.patch
+++ b/libxenserver-make.patch
@@ -1,40 +1,64 @@
---- 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 @@
+--- libxenserver/src/Makefile.orig 2015-04-17 19:33:43.000000000 +0200
++++ libxenserver/src/Makefile 2015-10-25 22:02:39.745774106 +0100
+@@ -45,9 +45,9 @@
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -fPIC
+ -W -Wall -Wmissing-prototypes -Werror -std=c99 $(POS_FLAG)
-LDFLAGS = -g $(shell xml2-config --libs) \
-- $(shell curl-config --libs) \
-- -Wl,-rpath,$(shell pwd)
+- $(shell curl-config --libs) \
+- -Wl,-rpath,$(shell pwd) $(CYGWIN_LIBXML)
+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
+@@ -66,6 +66,10 @@
--LIBXENAPI_HDRS = $(wildcard include/*.h)
-+LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h)
- LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c))
+ TARBALL_DEST = libxenserver-2.4
- TEST_PROGRAMS = test/test_vm_ops test/test_event_handling \
-@@ -56,13 +56,13 @@
++PREFIX = /usr
++INCLUDEDIR = $(PREFIX)/include
++LIBDIR = $(PREFIX)/lib
++
+ .PHONY: all
+ all: $(TEST_PROGRAMS)
+
+@@ -76,28 +80,25 @@
ln -sf $< $@
- libxenserver.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS)
-- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenserver.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenserver.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(LIBS)
+ libxenserver.so.2.4: $(LIBXENAPI_OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenserver.so.2 $(SHLIB_CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenserver.so.2 $(SHLIB_CFLAGS) -o $@ $^ $(LIBS)
libxenserver.a: $(LIBXENAPI_OBJS)
$(AR) rcs libxenserver.a $^
$(TEST_PROGRAMS): test/%: test/%.o libxenserver.so
-- $(CC) $(LDFLAGS) -o $@ $< -L . -lxenserver
-+ $(CC) $(LDFLAGS) -o $@ $< -L . -lxenserver $(PROG_LIBS)
+- $(CC) -o $@ $< $(TEST_LDFLAGS) $(LDFLAGS)
++ $(CC) -o $@ $< $(TEST_LDFLAGS) $(LDFLAGS) $(PROG_LIBS)
.PHONY: install
+ install: all libxenserver.a
+- $(INSTALL_DIR) $(DESTDIR)/include/xen/api
+- $(INSTALL_DIR) $(DESTDIR)/lib
+- $(INSTALL_DATA) libxenserver.so.2.4 $(DESTDIR)/lib
+- ln -sf libxenserver.so.2.4 $(DESTDIR)/lib/libxenserver.so.2
+- ln -sf libxenserver.so.2 $(DESTDIR)/lib/libxenserver.so
+- $(INSTALL_DATA) libxenserver.a $(DESTDIR)/lib
+- for i in $(LIBXENAPI_HDRS_INT); do \
+- $(INSTALL_DATA) $$i $(DESTDIR)/include/; \
+- done
++ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DATA) libxenserver.so.2.4 $(DESTDIR)$(LIBDIR)
++ ln -sf libxenserver.so.2.4 $(DESTDIR)$(LIBDIR)/libxenserver.so.2
++ ln -sf libxenserver.so.2 $(DESTDIR)$(LIBDIR)/libxenserver.so
++ $(INSTALL_DATA) libxenserver.a $(DESTDIR)$(LIBDIR)
+ for i in $(LIBXENAPI_HDRS); do \
+- $(INSTALL_DATA) $$i $(DESTDIR)/include/xen/api; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
+ done
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libxenserver.git/commitdiff/c20a75afc8910c4ff05771bb1f5fa862b9689735
More information about the pld-cvs-commit
mailing list