- packaged remaining files, added -system-moxie subpackage

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 2f1a7d2881f257d8d1df7dbac6c96f40e959dc86..cee340b665dbd150ab9c9cf6190d555ea9ce1a62 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -10,7 +10,7 @@
 #
 # Conditional build:
 %bcond_without sdl             # SDL UI and audio support
-%bcond_without opengl          # OpenGL support
+%bcond_without glx             # OpenGL support
 %bcond_without ceph            # Ceph/RBD support
 %bcond_with    glusterfs       # GlusterFS backend
 %bcond_without spice           # SPICE support
@@ -22,12 +22,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       1.3.0
+Version:       1.5.0
 Release:       0.1
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: a4030ddd2ba324152a97d65d3c0b247d
+# Source0-md5: b6f3265b8ed39d77e8f354f35cc26e16
 Patch0:                %{name}-cflags.patch
 Patch1:                vgabios-widescreens.patch
 Patch2:                %{name}-whitelist.patch
@@ -72,7 +72,7 @@ BuildRequires:        spice-server-devel >= 0.12.0
 %endif
 BuildRequires: texi2html
 BuildRequires: texinfo
-BuildRequires: usbredir-devel >= 0.5.3
+BuildRequires: usbredir-devel >= 0.6
 BuildRequires: vde2-devel
 BuildRequires: which
 %{?with_xen:BuildRequires:     xen-devel >= 3.4}
@@ -87,6 +87,7 @@ Requires:     %{name}-system-lm32 = %{version}-%{release}
 Requires:      %{name}-system-m68k = %{version}-%{release}
 Requires:      %{name}-system-microblaze = %{version}-%{release}
 Requires:      %{name}-system-mips = %{version}-%{release}
+Requires:      %{name}-system-moxie = %{version}-%{release}
 Requires:      %{name}-system-or32 = %{version}-%{release}
 Requires:      %{name}-system-ppc = %{version}-%{release}
 Requires:      %{name}-system-s390x = %{version}-%{release}
@@ -100,7 +101,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define        systempkg_req \
 Requires:      SDL >= 1.2.1 \
-Requires:      usbredir >= 0.5.3
+Requires:      usbredir >= 0.6
 
 # some PPC/SPARC boot image in ELF format
 %define                _noautostrip    .*%{_datadir}/qemu/.*-.*
@@ -329,6 +330,25 @@ dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
 
 Ten pakiet zawiera emulator systemu z procesorem MIPS.
 
+%package system-moxie
+Summary:       QEMU system emulator for Moxie
+Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem Moxie
+Group:         Development/Tools
+Requires:      %{name}-common = %{version}-%{release}
+%systempkg_req
+
+%description system-moxie
+QEMU is a generic and open source processor emulator which achieves a
+good emulation speed by using dynamic translation.
+
+This package provides the system emulator with Moxie CPU.
+
+%description system-moxie -l pl.UTF-8
+QEMU to ogólny, mający otwarte źródła emulator procesora, osiągający
+dobrą szybkość emulacji dzięki użyciu translacji dynamicznej.
+
+Ten pakiet zawiera emulator systemu z procesorem Moxie.
+
 %package system-or32
 Summary:       QEMU system emulator for OpenRISC
 Summary(pl.UTF-8):     QEMU - emulator systemu z procesorem OpenRISC
@@ -509,12 +529,11 @@ ln -s ../error.h qapi/error.h
        %{__enable_disable glusterfs} \
        --enable-libiscsi \
        --enable-mixemu \
-       %{__enable_disable opengl} \
+       %{__enable_disable glx} \
        %{__enable_disable ceph rbd} \
        %{__enable_disable sdl} \
        --enable-seccomp \
        %{__enable_disable spice} \
-       --enable-smartcard \
        --enable-smartcard-nss \
        --enable-usb-redir \
        --enable-uuid \
@@ -525,7 +544,6 @@ ln -s ../error.h qapi/error.h
        --enable-vnc-sasl \
        --enable-vnc-tls \
        %{__enable_disable xen} \
-       --audio-card-list="ac97,es1370,sb16,cs4231a,adlib,gus,hda" \
        --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
        --interp-prefix=%{_libdir}/qemu/lib-%%M
 # note: CONFIG_QEMU_HELPERDIR is used when compiling, libexecdir when installing;
@@ -557,6 +575,10 @@ EOF
 # install patched vesa tables with additional widescreen modes.
 cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin
 
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{de_DE,de}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{fr_FR,fr}
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -573,7 +595,7 @@ fi
 %files
 %defattr(644,root,root,755)
 
-%files common
+%files common -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README qemu-doc.html qemu-tech.html QMP/qmp-commands.txt
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
@@ -590,12 +612,14 @@ fi
 %{_datadir}/%{name}/keymaps
 %{_datadir}/%{name}/qemu-icon.bmp
 # various bios images
+%{_datadir}/%{name}/*.aml
 %{_datadir}/%{name}/*.bin
 %{_datadir}/%{name}/*.rom
 %{_datadir}/%{name}/*.dtb
 %{_datadir}/%{name}/openbios-ppc
 %{_datadir}/%{name}/openbios-sparc*
 %{_datadir}/%{name}/palcode-clipper
+%{_datadir}/%{name}/s390-ccw.img
 
 %files img
 %defattr(644,root,root,755)
@@ -616,6 +640,10 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-microblazeel
 %attr(755,root,root) %{_bindir}/qemu-mips
 %attr(755,root,root) %{_bindir}/qemu-mipsel
+%attr(755,root,root) %{_bindir}/qemu-mips64
+%attr(755,root,root) %{_bindir}/qemu-mips64el
+%attr(755,root,root) %{_bindir}/qemu-mipsn32
+%attr(755,root,root) %{_bindir}/qemu-mipsn32el
 %attr(755,root,root) %{_bindir}/qemu-or32
 %attr(755,root,root) %{_bindir}/qemu-ppc
 %attr(755,root,root) %{_bindir}/qemu-ppc64
@@ -661,6 +689,10 @@ fi
 %attr(755,root,root) %{_bindir}/qemu-system-mips64
 %attr(755,root,root) %{_bindir}/qemu-system-mips64el
 
+%files system-moxie
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qemu-system-moxie
+
 %files system-or32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qemu-system-or32