Attachment 572049 Details for Bug 806030 – Patch to spec file for el6 support

[patch] Patch to spec file for el6 support

el6.patch (text/plain), 4.41 KB, created by Orion Poplawski on 2012-03-22 17:39:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Orion Poplawski

Created: 2012-03-22 17:39:01 UTC

Size: 4.41 KB

patch

obsolete

>diff --git a/qemu.spec b/qemu.spec
>index 88b4eca..a5512e5 100644
>--- a/qemu.spec
>+++ b/qemu.spec
>@@ -125,16 +125,22 @@ BuildRequires: pciutils-devel
> BuildRequires: pulseaudio-libs-devel
> BuildRequires: ncurses-devel
> BuildRequires: libattr-devel
>+%if 0%{?fedora}
> BuildRequires: usbredir-devel
>+%endif
> BuildRequires: texinfo
> %ifarch %{ix86} x86_64
> BuildRequires: spice-protocol >= 0.8.1
>+%if 0%{?fedora}
> BuildRequires: spice-server-devel >= 0.9.0
> %endif
>+%endif
> # For network block driver
> BuildRequires: libcurl-devel
> # For rbd block driver
>+%if 0%{?fedora}
> BuildRequires: ceph-devel
>+%endif
> # We need both because the 'stap' binary is probed for by configure
> BuildRequires: systemtap
> BuildRequires: systemtap-sdt-devel
>@@ -153,7 +159,9 @@ BuildRequires: bluez-libs-devel
> # For Braille device support
> BuildRequires: brlapi-devel
> # For FDT device tree support
>+%if 0%{?fedora}
> BuildRequires: libfdt-devel
>+%endif
> # For test suite
> BuildRequires: check-devel
> Requires: %{name}-user = %{epoch}:%{version}-%{release}
>@@ -225,9 +233,11 @@ This package provides the common files needed by all QEMU targets
> %package guest-agent
> Summary: QEMU guest agent
> Group: System Environment/Daemons
>+%if 0%{?fedora}
> Requires(post): systemd-units
> Requires(preun): systemd-units
> Requires(postun): systemd-units
>+%endif
> 
> %description guest-agent
> QEMU is a generic and open source processor emulator which achieves a good
>@@ -470,7 +480,9 @@ sed -i.debug 's/"-g $CFLAGS"/"$CFLAGS"/g' configure
>             --disable-strip \
>             --extra-ldflags="$extraldflags -pie -Wl,-z,relro -Wl,-z,now" \
>             --extra-cflags="%{optflags} -fPIE -DPIE" \
>+%if 0%{?fedora}
>             --enable-spice \
>+%endif
>             --enable-trace-backend=dtrace \
>             --disable-werror \
>             --disable-xen
>@@ -501,8 +513,10 @@ make clean
>     --extra-cflags="%{optflags} -fPIE -DPIE" \
>     --disable-xen \
> %ifarch %{ix86} x86_64
>+%if 0%{?fedora}
>     --enable-spice \
> %endif
>+%endif
>     --enable-trace-backend=dtrace \
>     --disable-werror
> 
>@@ -521,6 +535,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> %define _udevdir /lib/udev/rules.d
> 
>+%if 0%{?fedora}
> install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/ksm.service
> install -D -p -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ksm
> install -D -p -m 0755 ksmctl $RPM_BUILD_ROOT/lib/systemd/ksmctl
>@@ -528,6 +543,7 @@ install -D -p -m 0755 ksmctl $RPM_BUILD_ROOT/lib/systemd/ksmctl
> install -D -p -m 0755 %{SOURCE7} $RPM_BUILD_ROOT/lib/systemd/system/ksmtuned.service
> install -D -p -m 0755 %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned
> install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf
>+%endif
> 
> %ifarch %{ix86} x86_64
> mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules
>@@ -617,12 +633,14 @@ for i in dummy \
>   chmod 644 $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d/$i.conf
> done < %{SOURCE1}
> 
>+%if 0%{?fedora}
> # For the qemu-guest-agent subpackage install the systemd
> # service and udev rules.
> mkdir -p $RPM_BUILD_ROOT%{_unitdir}
> mkdir -p $RPM_BUILD_ROOT%{_udevdir}
> install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}
> install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_udevdir}
>+%endif
> 
> %check
> make check
>@@ -644,9 +662,12 @@ getent passwd qemu >/dev/null || \
>   useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
>     -c "qemu user" qemu
> 
>+%if 0%{?fedora}
> /bin/systemctl enable ksm.service
> /bin/systemctl enable ksmtuned.service
>+%endif
> 
>+%if 0%{?fedora}
> %preun common
> if [ $1 -eq 0 ]; then
>     /bin/systemctl --system stop ksmtuned.service &>/dev/null || :
>@@ -660,6 +681,7 @@ if [ $1 -ge 1 ]; then
>     /bin/systemctl --system try-restart ksm.service &>/dev/null || :
>     /bin/systemctl --system try-restart ksmtuned.service &>/dev/null || :
> fi
>+%endif
> 
> %post user
> /bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || :
>@@ -690,20 +712,24 @@ fi
> %{_mandir}/man8/qemu-nbd.8*
> %{_bindir}/qemu-nbd
> %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf
>+%if 0%{?fedora}
> /lib/systemd/system/ksm.service
> /lib/systemd/ksmctl
> %config(noreplace) %{_sysconfdir}/sysconfig/ksm
> /lib/systemd/system/ksmtuned.service
> %{_sbindir}/ksmtuned
> %config(noreplace) %{_sysconfdir}/ksmtuned.conf
>+%endif
> %dir %{_sysconfdir}/qemu
> 
> %files guest-agent
> %defattr(-,root,root,-)
> %doc COPYING README
> %{_bindir}/qemu-ga
>+%if 0%{?fedora}
> %{_unitdir}/qemu-guest-agent.service
> %{_udevdir}/99-qemu-guest-agent.rules
>+%endif
> 
> %files user
> %defattr(-,root,root)

Actions: View | Diff

Attachments on bug 806030: 572049