[packages/vde] - added includes patch to build with current glibc - more docs, cleanup
qboosh
qboosh at pld-linux.org
Thu Oct 25 18:58:23 CEST 2012
commit 55034c176b53a198b7fbfb4a782678a4938ff310
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Oct 25 18:58:57 2012 +0200
- added includes patch to build with current glibc
- more docs, cleanup
vde-includes.patch | 20 ++++++++++++++++++++
vde.spec | 36 ++++++++++++++++++++++++++++--------
2 files changed, 48 insertions(+), 8 deletions(-)
---
diff --git a/vde.spec b/vde.spec
index b6339c7..83f73cc 100644
--- a/vde.spec
+++ b/vde.spec
@@ -5,10 +5,11 @@ Version: 1.5.11
Release: 2
License: GPL v2
Group: Networking/Utilities
-Source0: http://dl.sourceforge.net/vde/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/vde/%{name}-%{version}.tar.bz2
# Source0-md5: 00f739390a86fa5860a269ca157ee0f6
+Patch0: %{name}-includes.patch
URL: http://sourceforge.net/projects/vde/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: libtool
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,13 +26,15 @@ jak i rzeczywistych komputerów.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
-%configure
+%configure \
+ --disable-static
%{__make}
@@ -41,8 +44,14 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_bindir}/vdeqemu
-ln -sf vdeq $RPM_BUILD_ROOT%{_bindir}/vdeqemu
+# same directory, convert to relative symlink
+ln -snf vdeq $RPM_BUILD_ROOT%{_bindir}/vdeqemu
+
+# loadable module
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvdetap.la
+
+cp -p qemu/README README.qemu
+cp -p slirpvde/README README.slirpvde
%clean
rm -rf $RPM_BUILD_ROOT
@@ -52,7 +61,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
-%attr(755,root,root) %{_bindir}/*
+%doc README README.qemu README.slirpvde qemu/qemu-vde-HOWTO
+%attr(755,root,root) %{_bindir}/dpipe
+%attr(755,root,root) %{_bindir}/slirpvde
+%attr(755,root,root) %{_bindir}/vde_plug
+%attr(755,root,root) %{_bindir}/vde_switch
+%attr(755,root,root) %{_bindir}/vdeq
+%attr(755,root,root) %{_bindir}/vdeqemu
+%attr(755,root,root) %{_bindir}/vdetap
%attr(755,root,root) %{_libdir}/libvdetap.so
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/dpipe.1*
+%{_mandir}/man1/slirpvde.1*
+%{_mandir}/man1/vde_plug.1*
+%{_mandir}/man1/vde_switch.1*
+%{_mandir}/man1/vdeq.1*
+%{_mandir}/man1/vdetaplib.1*
diff --git a/vde-includes.patch b/vde-includes.patch
new file mode 100644
index 0000000..cfba033
--- /dev/null
+++ b/vde-includes.patch
@@ -0,0 +1,20 @@
+--- vde-1.5.11/vdetaplib/libvdetap.c.orig 2005-03-24 15:31:16.000000000 +0100
++++ vde-1.5.11/vdetaplib/libvdetap.c 2012-10-25 18:46:14.461514817 +0200
+@@ -13,6 +13,7 @@
+ #define __USE_LARGEFILE64
+ #include <fcntl.h>
+ #include <errno.h>
++#include <limits.h>
+ #include <signal.h>
+ #include <linux/ioctl.h>
+ #include <linux/if.h>
+--- vde-1.5.11/vde_switch.c.orig 2005-05-01 15:35:34.000000000 +0200
++++ vde-1.5.11/vde_switch.c 2012-10-25 18:46:43.134846950 +0200
+@@ -22,6 +22,7 @@
+ #include <syslog.h>
+ #include <libgen.h>
+ #include <endian.h>
++#include <limits.h>
+ #include <vde.h>
+ #include <switch.h>
+ #include <port.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vde.git/commitdiff/55034c176b53a198b7fbfb4a782678a4938ff310
More information about the pld-cvs-commit
mailing list