[Libosinfo] [PATCH 1/4] Assume availability of gobject introspection during RPM build

[Daniel P. Berrange]

The gobject introspection support is available for all
currently targetted platforms, so remove RPM conditionals.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 libosinfo.spec.in | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 0feed84..d1ba0be 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -1,15 +1,5 @@
 # -*- rpm-spec -*-
 
-# Plugin isn't ready for real world use yet - it needs
-# a security audit at very least
-%define with_plugin 0
-
-%define with_gir 0
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%define with_gir 1
-%endif
-
 Summary: A library for managing OS information for virtualization
 Name: libosinfo
 Version: @VERSION@
@@ -29,9 +19,7 @@ BuildRequires: vala-tools
 BuildRequires: libsoup-devel
 BuildRequires: /usr/bin/pod2man
 BuildRequires: hwdata
-%if %{with_gir}
 BuildRequires: gobject-introspection-devel
-%endif
 Requires: hwdata
 
 %description
@@ -69,13 +57,7 @@ This package provides the Vala bindings for libosinfo library.
 %setup -q
 
 %build
-%if %{with_gir}
-%define gir_arg --enable-introspection=yes
-%else
-%define gir_arg --enable-introspection=no
-%endif
-
-%configure %{gir_arg} --enable-vala=yes
+%configure --enable-introspection=yes --enable-vala=yes
 %__make %{?_smp_mflags} V=1
 
 chmod a-x examples/*.js examples/*.py
@@ -119,9 +101,7 @@ rm -fr %{buildroot}
 %{_mandir}/man1/osinfo-query.1*
 %{_mandir}/man1/osinfo-install-script.1*
 %{_libdir}/%{name}-1.0.so.*
-%if %{with_gir}
 %{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
-%endif
 
 %files devel
 %defattr(-, root, root)
@@ -132,9 +112,7 @@ rm -fr %{buildroot}
 %dir %{_includedir}/%{name}-1.0/osinfo/
 %{_includedir}/%{name}-1.0/osinfo/*.h
 %{_libdir}/pkgconfig/%{name}-1.0.pc
-%if %{with_gir}
 %{_datadir}/gir-1.0/Libosinfo-1.0.gir
-%endif
 %{_datadir}/gtk-doc/html/Libosinfo
 
 %files vala
-- 
2.7.4