- updated dependencies

diff --git a/spice-space.spec b/spice-space.spec
index 3a230378fec4c367a05c3ddb73744fd8ee9bb2f3..787b999abc4dd28c22f4636c4ffd5e99e01802e2 100644 (file)
--- a/spice-space.spec
+++ b/spice-space.spec
@@ -1,12 +1,13 @@
 #
 # Conditional build:
-%bcond_without opengl  # OpenGL support
+%bcond_without opengl          # OpenGL support
+%bcond_without static_libs     # static library
 #
 Summary:       SPICE virtualization solution
 Summary(pl.UTF-8):     System wirtualizacji SPICE
 # real package name (spice) is already occupied
 Name:          spice-space
-# NOTE: 0.13.x is unstable (see DEVEL branch for it)
+# NOTE: 0.odd.x versions are unstable
 Version:       0.14.3
 Release:       1
 License:       LGPL v2.1+
@@ -24,6 +25,7 @@ BuildRequires:        automake >= 1:1.11
 BuildRequires: celt051-devel >= 0.5.1.1
 BuildRequires: cyrus-sasl-devel >= 2
 BuildRequires: gcc >= 5:4.0
+BuildRequires: gdk-pixbuf2-devel >= 2.26
 BuildRequires: glib2-devel >= 1:2.38
 BuildRequires: gstreamer-devel >= 1.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
@@ -31,9 +33,10 @@ BuildRequires:       libcacard-devel >= 2.5.1
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2
-BuildRequires: lz4-devel
+BuildRequires: lz4-devel >= 129
 BuildRequires: openssl-devel >= 1.0.0
-BuildRequires: opus-devel >= 0.9.14
+BuildRequires: opus-devel >= 1.0.0
+BuildRequires: orc-devel >= 0.4
 BuildRequires: pixman-devel >= 0.17.7
 BuildRequires: pkgconfig
 BuildRequires: python >= 2
@@ -48,7 +51,7 @@ BuildRequires:        xorg-lib-libXinerama-devel >= 1.0
 BuildRequires: xorg-lib-libXrandr-devel >= 1.2
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: zlib-devel
-ExclusiveArch: %{ix86} %{x8664} x32 arm
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -74,9 +77,9 @@ Group:                Libraries
 Requires:      celt051 >= 0.5.1.1
 Requires:      glib2 >= 1:2.38
 Requires:      openssl >= 1.0.0
-Requires:      opus >= 0.9.14
+Requires:      opus >= 1.0.0
 Requires:      pixman >= 0.17.7
-Obsoletes:     spice-client
+Obsoletes:     spice-client < 0.12.6
 
 %description -n spice-server-libs
 SPICE server library.
@@ -90,8 +93,10 @@ Summary(pl.UTF-8):   Pliki nagłówkowe biblioteki serwera SPICE
 Group:         Development/Libraries
 Requires:      celt051-devel >= 0.5.1.1
 Requires:      glib2-devel >= 1:2.38
+Requires:      libcacard-devel >= 2.5.1
 Requires:      openssl-devel >= 1.0.0
 Requires:      pixman-devel >= 0.17.7
+Requires:      spice-protocol >= 0.14.0
 Requires:      spice-server-libs = %{version}-%{release}
 
 %description -n spice-server-devel
@@ -112,23 +117,6 @@ Static SPICE server library.
 %description -n spice-server-static -l pl.UTF-8
 Statyczna biblioteka serwera SPICE.
 
-%package -n spice-client
-Summary:       SPICE client for X11
-Summary(pl.UTF-8):     Klient SPICE dla X11
-Group:         X11/Applications
-Requires:      celt051 >= 0.5.1.1
-Requires:      libcacard >= 2.5.1
-Requires:      opus >= 0.9.14
-Requires:      pixman >= 0.17.7
-Requires:      xorg-lib-libXinerama >= 1.0
-Requires:      xorg-lib-libXrandr >= 1.2
-
-%description -n spice-client
-SPICE client for X11.
-
-%description -n spice-client -l pl.UTF-8
-Klient SPICE dla X11.
-
 %prep
 %setup -q -n spice-%{version}
 %patch0 -p1
@@ -149,11 +137,10 @@ cd ../..
 %configure \
        --disable-silent-rules \
        --enable-celt051 \
-       --enable-client \
        --enable-lz4 \
        %{?with_opengl:--enable-opengl} \
        --enable-smartcard \
-       --enable-static
+       %{?with_static_libs:--enable-static}
 
 %{__make}
 
@@ -184,6 +171,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/spice-server
 %{_pkgconfigdir}/spice-server.pc
 
+%if %{with static_libs}
 %files -n spice-server-static
 %defattr(644,root,root,755)
 %{_libdir}/libspice-server.a
+%endif