[gtk-vnc] rpm: always build with gir enabled

[Daniel P. Berrange <dberrange src gnome org>]

commit edcbb2036cab8d10f7e8a8afe230d679615713a6
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Fri May 3 18:27:02 2019 +0100

    rpm: always build with gir enabled
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 gtk-vnc.spec.in | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index db4ef6f..5105997 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -3,7 +3,6 @@
 # This spec file assumes you are building for Fedora 26 or newer,
 # or for RHEL 7 or newer. It may need some tweaks for other distros.
 
-%global with_gir 1
 %global with_vala 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -30,9 +29,7 @@ BuildRequires: python
 %endif
 %endif
 BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel zlib-devel intltool
-%if %{with_gir}
 BuildRequires: gobject-introspection-devel
-%endif
 BuildRequires: gtk3-devel
 %if %{with_vala}
 BuildRequires: vala-tools
@@ -118,13 +115,7 @@ Libraries, includes, etc. to compile with the gtk-vnc library
 %autosetup -n gtk-vnc-%{version}
 
 %build
-%if %{with_gir}
-%define gir_arg --enable-introspection=yes
-%else
-%define gir_arg --enable-introspection=no
-%endif
-
-%configure %{gir_arg} \
+%configure --enable-introspection=yes \
           --with-tls-priority=%{tls_priority}
 %__make %{?_smp_mflags} V=1
 chmod -x examples/*.pl examples/*.js examples/*.py
@@ -161,9 +152,7 @@ make %{?_smp_mflags} check
 
 %files -n gvnc -f %{name}.lang
 %{_libdir}/libgvnc-1.0.so.*
-%if %{with_gir}
 %{_libdir}/girepository-1.0/GVnc-1.0.typelib
-%endif
 %if %{with_vala}
 %{_datadir}/vala/vapi/gvnc-1.0.deps
 %{_datadir}/vala/vapi/gvnc-1.0.vapi
@@ -174,15 +163,11 @@ make %{?_smp_mflags} check
 %dir %{_includedir}/gvnc-1.0/
 %{_includedir}/gvnc-1.0/*.h
 %{_libdir}/pkgconfig/gvnc-1.0.pc
-%if %{with_gir}
 %{_datadir}/gir-1.0/GVnc-1.0.gir
-%endif
 
 %files -n gvncpulse -f %{name}.lang
 %{_libdir}/libgvncpulse-1.0.so.*
-%if %{with_gir}
 %{_libdir}/girepository-1.0/GVncPulse-1.0.typelib
-%endif
 %if %{with_vala}
 %{_datadir}/vala/vapi/gvncpulse-1.0.deps
 %{_datadir}/vala/vapi/gvncpulse-1.0.vapi
@@ -193,9 +178,7 @@ make %{?_smp_mflags} check
 %dir %{_includedir}/gvncpulse-1.0/
 %{_includedir}/gvncpulse-1.0/*.h
 %{_libdir}/pkgconfig/gvncpulse-1.0.pc
-%if %{with_gir}
 %{_datadir}/gir-1.0/GVncPulse-1.0.gir
-%endif
 
 %files -n gvnc-tools
 %doc AUTHORS
@@ -209,9 +192,7 @@ make %{?_smp_mflags} check
 
 %files -n gtk-vnc2
 %{_libdir}/libgtk-vnc-2.0.so.*
-%if %{with_gir}
 %{_libdir}/girepository-1.0/GtkVnc-2.0.typelib
-%endif
 %if %{with_vala}
 %{_datadir}/vala/vapi/gtk-vnc-2.0.deps
 %{_datadir}/vala/vapi/gtk-vnc-2.0.vapi
@@ -219,17 +200,13 @@ make %{?_smp_mflags} check
 
 %files -n gtk-vnc2-devel
 %doc examples/gvncviewer.c
-%if %{with_gir}
 %doc examples/gvncviewer.js
 %doc examples/gvncviewer.pl
 %doc examples/gvncviewer.py
-%endif
 %{_libdir}/libgtk-vnc-2.0.so
 %dir %{_includedir}/%{name}-2.0/
 %{_includedir}/%{name}-2.0/*.h
 %{_libdir}/pkgconfig/%{name}-2.0.pc
-%if %{with_gir}
 %{_datadir}/gir-1.0/GtkVnc-2.0.gir
-%endif
 
 %changelog