[gtk-vnc] spec: assume Fedora >= 20



commit b7bbc9c61f41a46a6a07edf42afacbd77f48ddc8
Author: Daniel P. Berrange <berrange redhat com>
Date:   Tue Aug 16 09:49:32 2016 +0100

    spec: assume Fedora >= 20
    
    Signed-off-by: Daniel P. Berrange <berrange redhat com>

 gtk-vnc.spec.in |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index b6ae5ee..cd149d9 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -1,12 +1,15 @@
 # -*- rpm-spec -*-
 
+# This spec file assumes you are building for Fedora 20 or newer,
+# or for RHEL 6 or newer. It may need some tweaks for other distros.
+
 %global with_gir 0
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_gir 1
 %endif
 
 %global with_gtk3 0
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_gtk3 1
 %endif
 
@@ -15,8 +18,6 @@
 %global with_vala 1
 %endif
 
-%global with_pulse 1
-
 %if 0%{?fedora} >= 25
     %global tls_priority "@LIBVIRT,SYSTEM"
 %else
@@ -42,9 +43,6 @@ BuildRequires: pygtk2-devel python-devel zlib-devel
 BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel intltool
 %if %{with_gir}
 BuildRequires: gobject-introspection-devel
-%if 0%{?fedora} && 0%{?fedora} < 14
-BuildRequires: gir-repository-devel
-%endif
 %endif
 %if %{with_gtk3}
 BuildRequires: gtk3-devel
@@ -52,9 +50,7 @@ BuildRequires: gtk3-devel
 %if %{with_vala}
 BuildRequires: vala-tools
 %endif
-%if %{with_pulse}
 BuildRequires: pulseaudio-libs-devel
-%endif
 BuildRequires: /usr/bin/pod2man
 
 %description
@@ -106,7 +102,6 @@ with the raw protocol itself.
 
 Libraries, includes, etc. to compile with the gvnc library
 
-%if %{with_pulse}
 %package -n gvncpulse
 Summary: A Pulse Audio bridge for VNC connections
 
@@ -127,7 +122,6 @@ It allows VNC clients to play back audio on the local
 system
 
 Libraries, includes, etc. to compile with the gvnc library
-%endif
 
 %package -n gvnc-tools
 Summary: Command line VNC tools
@@ -225,9 +219,11 @@ rm -fr %{buildroot}
 
 %postun -n gvncpulse -p /sbin/ldconfig
 
+%if %{with_gtk3}
 %post -n gtk-vnc2 -p /sbin/ldconfig
 
 %postun -n gtk-vnc2 -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(-, root, root)
@@ -272,7 +268,6 @@ rm -fr %{buildroot}
 %{_datadir}/gir-1.0/GVnc-1.0.gir
 %endif
 
-%if %{with_pulse}
 %files -n gvncpulse -f %{name}.lang
 %defattr(-, root, root)
 %{_libdir}/libgvncpulse-1.0.so.*
@@ -292,7 +287,6 @@ rm -fr %{buildroot}
 %if %{with_gir}
 %{_datadir}/gir-1.0/GVncPulse-1.0.gir
 %endif
-%endif
 
 %files -n gvnc-tools
 %defattr(-, root, root)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]