[dbus-glib] - Drop .gir file, it's now in gobject-introspection

Colin Walters walters at fedoraproject.org
Tue Sep 21 18:46:05 UTC 2010


commit eb8b1079422ff050448a01295e82c7e9c7fd1e2c
Author: Colin Walters <walters at verbum.org>
Date:   Tue Sep 21 14:37:23 2010 -0400

    - Drop .gir file, it's now in gobject-introspection

 dbus-glib.spec |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/dbus-glib.spec b/dbus-glib.spec
index 61a32e3..4883de5 100644
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -8,23 +8,20 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.88
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 #VCS: git:git://git.freedesktop.org/git/dbus/dbus-glib
 Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
-Source1: http://git.gnome.org/browse/gir-repository/plain/gir/DBusGLib-1.0.gir
 License: AFL and GPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: chkconfig >= 1.3.26
-Requires: gobject-introspection
 BuildRequires: libtool
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gettext
-BuildRequires: gobject-introspection-devel
 
 %description
 
@@ -38,7 +35,6 @@ Requires: %name = %{version}-%{release}
 Requires: glib2-devel
 Requires: dbus-devel
 Requires: pkgconfig
-Requires: gobject-introspection-devel
 Obsoletes: dbus-devel < 0.90
 
 %description devel
@@ -75,11 +71,6 @@ rm -rf %{buildroot}
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# As gir-repository doesn't exist anymore, do this ourselves
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gir-1.0/DBusGLib-1.0.gir
-/usr/bin/g-ir-compiler --includedir=.  %{SOURCE1} -o DBusGLib-1.0.typelib
-install -D DBusGLib-1.0.typelib $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -98,7 +89,6 @@ rm -rf %{buildroot}
 
 %{_libdir}/*glib*.so.*
 %{_bindir}/dbus-binding-tool
-%{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
 
 %files devel
 %defattr(-,root,root)
@@ -110,7 +100,6 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 %{_sysconfdir}/bash_completion.d/dbus-bash-completion.sh
 %{_libexecdir}/dbus-bash-completion-helper
-%{_datadir}/gir-1.0/DBusGLib-1.0.gir
 
 %if 0
 %files gtk
@@ -121,6 +110,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 21 2010 Colin Walters <walters at verbum.org> - 0.88-2
+- Drop .gir file, it's now in gobject-introspection
+
 * Thu Aug 12 2010 Colin Walters <walters at verbum.org> - 0.88-1
 - New upstream version
 - drop now-merged shadow props patch


More information about the scm-commits mailing list