Accepting request 176528 from home:a_faerber:branches:Virtualization
Clean up dependencies, fix qemu-lang summary and change post-build-checks suppression as requested by Adrian OBS-URL: https://build.opensuse.org/request/show/176528 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=141
This commit is contained in:
Andreas Färber
Git OBS Bridge
parent
bb2fc3ecbb
commit
eef5f18e30
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 24 16:28:50 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Drop unneeded dependencies: SDL, ALSA, bison, cURL, cyrus-sasl,
|
||||
libaio, libcap, libcap-ng, libgnutls, libjpeg, libpcap, libpng,
|
||||
pwdutils, timezone
|
||||
* Reorder BuildRequires alphabetically
|
||||
- Tidy up suppression of post-build-checks (requested by Adrian)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 24 12:33:23 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
||||
@ -66,51 +66,38 @@ Patch0038: 0038-virtfs-proxy-helper-Provide-__u64-f.patch
|
||||
Source300: rpmlintrc
|
||||
Source400: update_git.sh
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: libaio
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: fdupes
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildRequires: glib2-devel-static
|
||||
%else
|
||||
BuildRequires: glib2-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: glibc-devel-static
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: libattr-devel-static
|
||||
%else
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: libpng-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1220
|
||||
BuildRequires: makeinfo
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
# we must not install the qemu package when under qemu build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
BuildRequires: -post-build-checks
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pcre-devel-static
|
||||
%endif
|
||||
BuildRequires: python
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildRequires: zlib-devel-static
|
||||
%else
|
||||
BuildRequires: zlib-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: libattr-devel-static
|
||||
# we must not install the qemu-linux-user package when under QEMU build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
#!BuildIgnore: post-build-checks
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildRequires: glib2-devel-static
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pcre-devel-static
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
Requires: pwdutils
|
||||
Requires: timezone
|
||||
Provides: qemu:%_bindir/qemu-arm
|
||||
|
||||
%description
|
||||
|
||||
@ -29,51 +29,38 @@ PATCH_FILES
|
||||
Source300: rpmlintrc
|
||||
Source400: update_git.sh
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: libaio
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: fdupes
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildRequires: glib2-devel-static
|
||||
%else
|
||||
BuildRequires: glib2-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: glibc-devel-static
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: libattr-devel-static
|
||||
%else
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: libpng-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1220
|
||||
BuildRequires: makeinfo
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
# we must not install the qemu package when under qemu build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
BuildRequires: -post-build-checks
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pcre-devel-static
|
||||
%endif
|
||||
BuildRequires: python
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildRequires: zlib-devel-static
|
||||
%else
|
||||
BuildRequires: zlib-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: libattr-devel-static
|
||||
# we must not install the qemu-linux-user package when under QEMU build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
#!BuildIgnore: post-build-checks
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1140
|
||||
BuildRequires: glib2-devel-static
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: pcre-devel-static
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
Requires: pwdutils
|
||||
Requires: timezone
|
||||
Provides: qemu:%_bindir/qemu-arm
|
||||
|
||||
%description
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 24 17:11:36 UTC 2013 - afaerber@suse.de
|
||||
|
||||
- Drop dependency on bison
|
||||
* Reorder BuildRequires alphabetically
|
||||
- Fix summary of qemu-lang sub-package
|
||||
- Drop post-build-checks suppression (qemu-linux-user only)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 24 14:31:59 UTC 2013 - afaerber@suse.de
|
||||
|
||||
|
||||
27
qemu.spec
27
qemu.spec
@ -69,7 +69,6 @@ Source400: update_git.sh
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
%if 0%{?suse_version} >= 1130
|
||||
BuildRequires: brlapi-devel
|
||||
@ -77,6 +76,8 @@ BuildRequires: brlapi-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: gtk3-devel
|
||||
%else
|
||||
@ -87,18 +88,22 @@ BuildRequires: libaio-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
%ifarch ppc ppc64
|
||||
#we need that for -M pseries support in SLES
|
||||
BuildRequires: libfdt1-devel
|
||||
%endif
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: libpixman-1-0-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libvdeplug3-devel
|
||||
%if 0%{?suse_version} > 1220
|
||||
BuildRequires: makeinfo
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
# we must not install the qemu package when under qemu build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
BuildRequires: -post-build-checks
|
||||
%endif
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: vte2-devel
|
||||
%endif
|
||||
@ -109,16 +114,6 @@ BuildRequires: libspice-server-devel
|
||||
BuildRequires: spice-protocol-devel
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ppc ppc64
|
||||
#we need that for -M pseries support in SLES
|
||||
BuildRequires: libfdt1-devel
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libpixman-1-0-devel
|
||||
BuildRequires: libvdeplug3-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
Requires: /usr/sbin/groupadd
|
||||
Requires: pwdutils
|
||||
Requires: timezone
|
||||
@ -133,7 +128,7 @@ as PC and PowerMac systems.
|
||||
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%package lang
|
||||
Summary: Universal CPU emulator -- Guest agent
|
||||
Summary: Universal CPU emulator -- Translations
|
||||
Group: System/Emulators/PC
|
||||
|
||||
%description lang
|
||||
|
||||
27
qemu.spec.in
27
qemu.spec.in
@ -32,7 +32,6 @@ Source400: update_git.sh
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bluez-devel
|
||||
%if 0%{?suse_version} >= 1130
|
||||
BuildRequires: brlapi-devel
|
||||
@ -40,6 +39,8 @@ BuildRequires: brlapi-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
%if 0%{?suse_version} >= 1220
|
||||
BuildRequires: gtk3-devel
|
||||
%else
|
||||
@ -50,18 +51,22 @@ BuildRequires: libaio-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
%ifarch ppc ppc64
|
||||
#we need that for -M pseries support in SLES
|
||||
BuildRequires: libfdt1-devel
|
||||
%endif
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpcap-devel
|
||||
BuildRequires: libpixman-1-0-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libvdeplug3-devel
|
||||
%if 0%{?suse_version} > 1220
|
||||
BuildRequires: makeinfo
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
# we must not install the qemu package when under qemu build
|
||||
%if 0%{?qemu_user_space_build:1}
|
||||
BuildRequires: -post-build-checks
|
||||
%endif
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: vte2-devel
|
||||
%endif
|
||||
@ -72,16 +77,6 @@ BuildRequires: libspice-server-devel
|
||||
BuildRequires: spice-protocol-devel
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ppc ppc64
|
||||
#we need that for -M pseries support in SLES
|
||||
BuildRequires: libfdt1-devel
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libpixman-1-0-devel
|
||||
BuildRequires: libvdeplug3-devel
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: python
|
||||
Requires: /usr/sbin/groupadd
|
||||
Requires: pwdutils
|
||||
Requires: timezone
|
||||
@ -96,7 +91,7 @@ as PC and PowerMac systems.
|
||||
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%package lang
|
||||
Summary: Universal CPU emulator -- Guest agent
|
||||
Summary: Universal CPU emulator -- Translations
|
||||
Group: System/Emulators/PC
|
||||
|
||||
%description lang
|
||||
|
||||
Loading…
Reference in New Issue
Block a user