rpms/dbus-glib/devel .cvsignore, 1.10, 1.11 dbus-glib.spec, 1.46, 1.47 sources, 1.11, 1.12

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/dbus-glib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6775

Modified Files:
	.cvsignore dbus-glib.spec sources 
Log Message:
* Tue Jun 29 2010 Bastien Nocera <bnocera at redhat.com> 0.86-2
- Add introspection data from gir-repository
- Remove unneeded autotools calls



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-glib/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	27 Jan 2010 21:31:27 -0000	1.10
+++ .cvsignore	29 Jun 2010 13:25:06 -0000	1.11
@@ -1 +1,2 @@
 dbus-glib-0.84.tar.gz
+DBusGLib-1.0.gir


Index: dbus-glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-glib/devel/dbus-glib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- dbus-glib.spec	25 Mar 2010 00:36:29 -0000	1.46
+++ dbus-glib.spec	29 Jun 2010 13:25:06 -0000	1.47
@@ -8,23 +8,23 @@
 Summary: GLib bindings for D-Bus
 Name: dbus-glib
 Version: 0.86
-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: autoconf
-# this patch requires autoreconf
-BuildRequires: autoconf automake libtool gettext-devel gtk-doc
+BuildRequires: gobject-introspection-devel
 
 %description
 
@@ -38,6 +38,7 @@ Requires: %name = %{version}-%{release}
 Requires: glib2-devel
 Requires: dbus-devel
 Requires: pkgconfig
+Requires: gobject-introspection-devel
 Obsoletes: dbus-devel < 0.90
 
 %description devel
@@ -61,8 +62,6 @@ D-Bus tools written using the gtk+ GUI l
 
 
 %build
-libtoolize --force --copy
-autoreconf
 %configure --disable-tests \
 	--enable-verbose-mode=yes \
 	--enable-asserts=yes \
@@ -77,6 +76,11 @@ 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
 
@@ -95,6 +99,7 @@ rm -rf %{buildroot}
 
 %{_libdir}/*glib*.so.*
 %{_bindir}/dbus-binding-tool
+%{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
 
 %files devel
 %defattr(-,root,root)
@@ -106,6 +111,7 @@ 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
@@ -116,6 +122,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Jun 29 2010 Bastien Nocera <bnocera at redhat.com> 0.86-2
+- Add introspection data from gir-repository
+- Remove unneeded autotools calls
+
 * Thu Mar 18 2010 Colin Walters <walters at verbum.org> - 0.86-1
 - New upstream
   Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-glib/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Mar 2010 00:36:29 -0000	1.11
+++ sources	29 Jun 2010 13:25:06 -0000	1.12
@@ -1 +1,2 @@
 cd0ab148fb0c786fc88be49d19971f50  dbus-glib-0.86.tar.gz
+e384b0cede35bd33caebb29b0faf93dd  DBusGLib-1.0.gir