[virt-viewer] Sync spec file with upstream one
Christophe Fergeau
teuf at fedoraproject.org
Wed Feb 26 12:21:38 UTC 2014
commit bca1debe810feb4d5cf60c81a7ba61df5286597c
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Feb 26 11:43:48 2014 +0100
Sync spec file with upstream one
This adds the needed bits to update the mime database (rhbz#1044209)
virt-viewer.spec | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/virt-viewer.spec b/virt-viewer.spec
index 28a8a8e..0368b8a 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -6,24 +6,20 @@
%{!?enable_autotools:%define enable_autotools 0}
%define with_gtk3 0
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%define with_gtk3 1
%endif
%define with_spice 0
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
%define with_spice 1
%endif
%define with_govirt 0
-%if 0%{?fedora} >= 19
+%if 0%{?fedora} > 19 || 0%{?rhel} >= 7
%define with_govirt 1
%endif
-%if 0%{?rhel} >= 6
-%define with_spice 1
-%endif
-
# spice-gtk is x86 x86_64 arm only currently:
%ifnarch %{ix86} x86_64 %{arm}
%define with_spice 0
@@ -51,14 +47,14 @@ BuildRequires: gettext-devel
BuildRequires: libtool
%endif
-BuildRequires: glib2-devel >= 2.22
+BuildRequires: glib2-devel >= 2.22.0
%if %{with_gtk3}
-BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: gtk3-devel >= 3.0
%else
-BuildRequires: gtk2-devel >= 2.12.0
+BuildRequires: gtk2-devel >= 2.18.0
%endif
-BuildRequires: libvirt-devel >= 0.9.7
-BuildRequires: libxml2-devel
+BuildRequires: libvirt-devel >= 0.10.0
+BuildRequires: libxml2-devel >= 2.6.0
%if %{with_gtk3}
BuildRequires: gtk-vnc2-devel >= 0.4.0
%else
@@ -66,16 +62,16 @@ BuildRequires: gtk-vnc-devel >= 0.3.8
%endif
%if %{with_spice}
%if %{with_gtk3}
-BuildRequires: spice-gtk3-devel >= 0.20
+BuildRequires: spice-gtk3-devel >= 0.22
%else
-BuildRequires: spice-gtk-devel >= 0.20
+BuildRequires: spice-gtk-devel >= 0.22
%endif
BuildRequires: spice-protocol >= 0.10.1
%endif
BuildRequires: /usr/bin/pod2man
BuildRequires: intltool
%if %{with_govirt}
-BuildRequires: libgovirt-devel >= 0.0.3
+BuildRequires: libgovirt-devel >= 0.3.0
%endif
%if 0%{?fedora} >= 20
@@ -113,7 +109,7 @@ autoreconf -if
%define govirt_arg --with-ovirt
%endif
-%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=-%{release}
+%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=-%{release} --disable-update-mimedb
%__make %{?_smp_mflags}
@@ -133,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \
spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25
update-desktop-database -q %{_datadir}/applications
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
%postun
if [ $1 -eq 0 ] ; then
@@ -141,6 +138,7 @@ if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer
fi
update-desktop-database -q %{_datadir}/applications
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
More information about the scm-commits
mailing list