Author: qboosh Date: Tue Jan 13 18:27:52 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- remaining pl
- kernel/userspace bconds
---- Files affected:
SPECS:
open-vm-tools.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/open-vm-tools.spec
diff -u SPECS/open-vm-tools.spec:1.5 SPECS/open-vm-tools.spec:1.6
--- SPECS/open-vm-tools.spec:1.5 Tue Jan 13 13:20:41 2009
+++ SPECS/open-vm-tools.spec Tue Jan 13 19:27:47 2009
@@ -1,6 +1,10 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without kernel # without kernel modules
%bcond_without dist_kernel # without distribution kernel
-
+%bcond_without userspace # without userspace package
+#
%define snap 2008.12.23
%define rev 137496
%define modsrc modules/linux
@@ -14,17 +18,14 @@
Release: %{rel}
License: GPL
Group: Applications/System
-Source0:
http://dl.sourceforge.net/sourceforge/open-vm-tools/%{name}-%{snap}-%{rev}.tar.gz
+Source0:
http://dl.sourceforge.net/open-vm-tools/%{name}-%{snap}-%{rev}.tar.gz
# Source0-md5: 2c457c9bcee711140ec137a6829525eb
Source1: %{name}-packaging
-URL: http://open-vm-tools.sf.net/
-BuildRequires: autoconf
-BuildRequires: automake
+URL: http://open-vm-tools.sourceforge.net/
+%if %{with userspace}
BuildRequires: gtk+-devel
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
-BuildRequires: libtool
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.16}
BuildRequires: pkgconfig
BuildRequires: uriparser-devel
BuildRequires: xorg-lib-libX11-devel
@@ -32,6 +33,10 @@
BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: xorg-lib-libXtst-devel
BuildRequires: xorg-lib-libXScrnSaver-devel
+%endif
+%if %{with kernel} && %{with dist_kernel}
+BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.16
+%endif
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +47,8 @@
Narzędzia dla systemu-gościa dla VMware.
%package -n kernel%{_alt_kernel}-misc-pvscsi
-Summary: VMware pvscsi module
+Summary: VMware pvscsi Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware pvscsi
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -53,10 +59,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-pvscsi
-VMware pvscsi module.
+VMware pvscsi Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-pvscsi -l pl.UTF-8
+Moduł jądra Linuksa VMware pvscsi.
%package -n kernel%{_alt_kernel}-misc-vmblock
-Summary: VMware vmblock module
+Summary: VMware vmblock Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmblock
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -67,10 +77,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmblock
-VMware vmblock module.
+VMware vmblock Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmblock -l pl.UTF-8
+Moduł jądra Linuksa VMware vmblock.
%package -n kernel%{_alt_kernel}-misc-vmci
-Summary: VMware vmci module
+Summary: VMware vmci Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmci
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -81,10 +95,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmci
-VMware vmci module.
+VMware vmci Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmci -l pl.UTF-8
+Moduł jądra Linuksa VMware vmci.
%package -n kernel%{_alt_kernel}-misc-vmhgfs
-Summary: VMware vmhgfs module
+Summary: VMware vmhgfs Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmhgfs
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -95,10 +113,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmhgfs
-VMware vmhgfs module.
+VMware vmhgfs Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmhgfs -l pl.UTF-8
+Moduł jądra Linuksa VMware vmhgfs.
%package -n kernel%{_alt_kernel}-misc-vmmemctl
-Summary: VMware vmmemctl module
+Summary: VMware vmmemctl Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmmemctl
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -109,10 +131,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmmemctl
-VMware vmmemctl module.
+VMware vmmemctl Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmmemctl -l pl.UTF-8
+Moduł jądra Linuksa VMware vmmemctl.
%package -n kernel%{_alt_kernel}-misc-vmsync
-Summary: VMware vmsync module
+Summary: VMware vmsync Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmsync
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -123,10 +149,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmsync
-VMware vmsync module.
+VMware vmsync Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmsync -l pl.UTF-8
+Moduł jądra Linuksa VMware vmsync.
%package -n kernel%{_alt_kernel}-misc-vmxnet
-Summary: VMware vmxnet module
+Summary: VMware vmxnet Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmxnet
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -137,10 +167,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmxnet
-VMware vmxnet module.
+VMware vmxnet Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmxnet -l pl.UTF-8
+Moduł jądra Linuksa VMware vmxnet.
%package -n kernel%{_alt_kernel}-misc-vmxnet3
-Summary: VMware vmxnet3 module
+Summary: VMware vmxnet3 Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vmxnet3
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -151,10 +185,14 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vmxnet3
-VMware vmxnet3 module.
+VMware vmxnet3 Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vmxnet3 -l pl.UTF-8
+Moduł jądra Linuksa VMware vmxnet3.
%package -n kernel%{_alt_kernel}-misc-vsock
-Summary: VMware vsock module
+Summary: VMware vsock Linux kernel module
+Summary(pl.UTF-8): Moduł jądra Linuksa VMware vsock
Release: %{r...@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
@@ -165,13 +203,17 @@
%endif
%description -n kernel%{_alt_kernel}-misc-vsock
-VMware vsock module.
+VMware vsock Linux kernel module.
+
+%description -n kernel%{_alt_kernel}-misc-vsock -l pl.UTF-8
+Moduł jądra Linuksa VMware vsock.
%prep
%setup -q -n %{name}-%{snap}-%{rev}
cp %{SOURCE1} packaging
%build
+%if %{with kernel}
%build_kernel_modules -C %{modsrc}/pvscsi -m pvscsi SRCROOT=$PWD
VM_KBUILD=26 VM_CCVER=%{ccver}
%build_kernel_modules -C %{modsrc}/vmblock -m vmblock SRCROOT=$PWD
VM_KBUILD=26 VM_CCVER=%{ccver}
%build_kernel_modules -C %{modsrc}/vmci -m vmci
SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
@@ -181,15 +223,18 @@
%build_kernel_modules -C %{modsrc}/vmxnet -m vmxnet SRCROOT=$PWD
VM_KBUILD=26 VM_CCVER=%{ccver}
%build_kernel_modules -C %{modsrc}/vmxnet3 -m vmxnet3 SRCROOT=$PWD
VM_KBUILD=26 VM_CCVER=%{ccver}
%build_kernel_modules -C %{modsrc}/vsock -m vsock SRCROOT=$PWD
VM_KBUILD=26 VM_CCVER=%{ccver}
+%endif
+%if %{with userspace}
%configure2_13 \
--without-kernel-modules
%{__make}
-
+%endif
%install
rm -rf $RPM_BUILD_ROOT
+%if %{with kernel}
%install_kernel_modules -m %{modsrc}/pvscsi/pvscsi -d misc
%install_kernel_modules -m %{modsrc}/vmblock/vmblock -d misc
%install_kernel_modules -m %{modsrc}/vmci/vmci -d misc
@@ -199,7 +244,9 @@
%install_kernel_modules -m %{modsrc}/vmxnet/vmxnet -d misc
%install_kernel_modules -m %{modsrc}/vmxnet3/vmxnet3 -d misc
%install_kernel_modules -m %{modsrc}/vsock/vsock -d misc
+%endif
+%if %{with userspace}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -207,6 +254,7 @@
ln -sf %{_sbindir}/mount.vmhgfs $RPM_BUILD_ROOT/sbin/mount.vmhgfs
mv $RPM_BUILD_ROOT/etc/pam.d/{vmware-guestd*,vmware-guestd}
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -238,6 +286,7 @@
%post -n kernel%{_alt_kernel}-misc-vsock
%depmod %{_kernel_ver}
+%if %{with userspace}
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README packaging
@@ -245,7 +294,7 @@
%dir /etc/vmware-tools
%attr(755,root,root) /etc/vmware-tools/*vm-*
%config(noreplace) %verify(not md5 mtime size) /etc/vmware-tools/tools.conf
-/sbin/mount.vmhgfs
+%attr(755,root,root) /sbin/mount.vmhgfs
%attr(755,root,root) %{_bindir}/vmware-checkvm
%attr(755,root,root) %{_bindir}/vmware-hgfsclient
%attr(755,root,root) %{_bindir}/vmware-toolbox
@@ -255,9 +304,11 @@
%attr(755,root,root) %{_bindir}/vmware-xferlogs
%attr(755,root,root) %{_sbindir}/mount.vmhgfs
%attr(755,root,root) %{_sbindir}/vmware-guestd
-%{_libdir}/lib*.so*
+%attr(755,root,root) %{_libdir}/lib*.so*
%{_desktopdir}/vmware-user.desktop
+%endif
+%if %{with kernel}
%files -n kernel%{_alt_kernel}-misc-pvscsi
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/pvscsi.ko*
@@ -293,6 +344,7 @@
%files -n kernel%{_alt_kernel}-misc-vsock
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/vsock.ko*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -300,6 +352,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2009/01/13 18:27:47 qboosh
+- remaining pl
+- kernel/userspace bconds
+
Revision 1.5 2009/01/13 12:20:41 pascalek
- missing rel variable definition
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/open-vm-tools.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
