Attachment 1488 Details for Bug 4396 – new version of the patch

[patch] new version of the patch

virtualbox-4.1.8-stop-removing-sdk.patch (text/plain), 2.05 KB, created by Kamil Rytarowski on 2012-02-03 13:38:31 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Rytarowski

Created: 2012-02-03 13:38:31 CET

Size: 2.05 KB

patch

obsolete

>Index: SPECS/virtualbox.spec
>===================================================================
>--- SPECS/virtualbox.spec	(wersja 204196)
>+++ SPECS/virtualbox.spec	(kopia robocza)
>@@ -11,9 +11,11 @@
> 
> %define vboxlibdir	%{_libdir}/%{name}
> %define vboxdatadir	%{_datadir}/%{name}
>+%define vboxpydir	%{python_sitedir}/%{name}
> 
> %define build_additions	1
> %define build_doc	1
>+%define build_sdk	1
> 
> %ifarch %{ix86}
> %define vbox_platform linux.x86
>@@ -175,6 +177,26 @@
> This package contains the user manual PDF file for %{name}.
> %endif
> 
>+%if %{build_sdk}
>+%package devel
>+Summary:        %{name} SDK
>+Group:          Development/Libraries
>+Requires:       %{name} = %{version}-%{release}
>+Requires:       python-%{name} = %{version}-%{release}
>+
>+%description devel
>+This package contains the SDK for %{name}.
>+
>+
>+%package -n python-%{name}
>+Summary: %{name} SDK
>+Group:	  	  Development/Libraries
>+Requires:       %{name} = %{version}-%{release}
>+
>+%description -n python-%{name}
>+Python XPCOM bindings to %{name}.
>+%endif
>+
> %prep
> %setup -q -n %{distname}
> %apply_patches
>@@ -390,8 +412,21 @@
> # add missing makefile for kernel module
> install -m644 src/VBox/HostDrivers/Support/linux/Makefile %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}/
> 
>+%if %{build_sdk}
>+mkdir -p %{buildroot}%{vboxpydir}
>+
>+pushd obj/bin/sdk/installer
>+VBOX_INSTALL_PATH=%{vboxlibdir} \
>+        python vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
>+popd
>+cp -rp obj/bin/sdk/. %{buildroot}%{vboxlibdir}/sdk
>+rm -rf %{buildroot}%{vboxlibdir}/sdk/installer
>+%else
>+rm -rf %{buildroot}%{vboxlibdir}/sdk
>+%endif
>+
> # remove unpackaged files
>-rm -rf %{buildroot}%{vboxlibdir}/{src,sdk,testcase}
>+rm -rf %{buildroot}%{vboxlibdir}/{src,testcase}
> rm  -f %{buildroot}%{vboxlibdir}/tst*
> rm  -f %{buildroot}%{vboxlibdir}/vboxkeyboard.tar.gz
> rm  -f %{buildroot}%{vboxlibdir}/SUP*
>@@ -539,3 +574,12 @@
> %files doc
> %doc %{_defaultdocdir}/%{name}/UserManual.pdf
> %endif
>+
>+%if %{build_sdk}
>+%files devel
>+%{vboxlibdir}/sdk
>+
>+%files -n python-%{name}
>+%{vboxpydir}
>+%{vboxpydir}/vboxapi*
>+%endif

Index: SPECS/virtualbox.spec
===================================================================
--- SPECS/virtualbox.spec	(wersja 204196)
+++ SPECS/virtualbox.spec	(kopia robocza)
@@ -11,9 +11,11 @@
 
 %define vboxlibdir	%{_libdir}/%{name}
 %define vboxdatadir	%{_datadir}/%{name}
+%define vboxpydir	%{python_sitedir}/%{name}
 
 %define build_additions	1
 %define build_doc	1
+%define build_sdk	1
 
 %ifarch %{ix86}
 %define vbox_platform linux.x86
@@ -175,6 +177,26 @@
 This package contains the user manual PDF file for %{name}.
 %endif
 
+%if %{build_sdk}
+%package devel
+Summary:        %{name} SDK
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       python-%{name} = %{version}-%{release}
+
+%description devel
+This package contains the SDK for %{name}.
+
+
+%package -n python-%{name}
+Summary: %{name} SDK
+Group:	  	  Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description -n python-%{name}
+Python XPCOM bindings to %{name}.
+%endif
+
 %prep
 %setup -q -n %{distname}
 %apply_patches
@@ -390,8 +412,21 @@
 # add missing makefile for kernel module
 install -m644 src/VBox/HostDrivers/Support/linux/Makefile %{buildroot}%{_usr}/src/%{name}-%{version}-%{release}/
 
+%if %{build_sdk}
+mkdir -p %{buildroot}%{vboxpydir}
+
+pushd obj/bin/sdk/installer
+VBOX_INSTALL_PATH=%{vboxlibdir} \
+        python vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
+popd
+cp -rp obj/bin/sdk/. %{buildroot}%{vboxlibdir}/sdk
+rm -rf %{buildroot}%{vboxlibdir}/sdk/installer
+%else
+rm -rf %{buildroot}%{vboxlibdir}/sdk
+%endif
+
 # remove unpackaged files
-rm -rf %{buildroot}%{vboxlibdir}/{src,sdk,testcase}
+rm -rf %{buildroot}%{vboxlibdir}/{src,testcase}
 rm  -f %{buildroot}%{vboxlibdir}/tst*
 rm  -f %{buildroot}%{vboxlibdir}/vboxkeyboard.tar.gz
 rm  -f %{buildroot}%{vboxlibdir}/SUP*
@@ -539,3 +574,12 @@
 %files doc
 %doc %{_defaultdocdir}/%{name}/UserManual.pdf
 %endif
+
+%if %{build_sdk}
+%files devel
+%{vboxlibdir}/sdk
+
+%files -n python-%{name}
+%{vboxpydir}
+%{vboxpydir}/vboxapi*
+%endif

Actions: View | Diff

Attachments on bug 4396: 1487 | 1488