# Conditional build:
%bcond_without apidocs # disable gtk-doc
%bcond_without static_libs # don't build static library
-#
-%define dbus_version 1.1
+
+%define dbus_version 1.2.16
%define expat_version 1:1.95.5
-%define glib_version 1:2.10.1
-#
+%define glib2_version 1:2.26
Summary: GLib-based library for using D-BUS
Summary(pl.UTF-8): Biblioteka do używania D-BUS oparta o GLib
Name: dbus-glib
-Version: 0.86
+Version: 0.100.1
Release: 1
License: AFL v2.1 or GPL v2
Group: Libraries
Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
-# Source0-md5: cd0ab148fb0c786fc88be49d19971f50
+# Source0-md5: d758967b70ea3d5318b62839d5bd440f
Patch0: %{name}-configure.patch
-Patch1: %{name}-as-needed.patch
+Patch1: %{name}-am.patch
URL: http://www.freedesktop.org/Software/DBusBindings
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1:1.9
%{?with_apidocs:BuildRequires: docbook-dtd412-xml}
BuildRequires: expat-devel >= %{expat_version}
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= %{glib_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}
%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.8}
-%{?with_apidocs:BuildRequires: gtk-doc}
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.527
%patch0 -p1
%patch1 -p1
-%if %{without apidocs}
-echo 'EXTRA_DIST=' > gtk-doc.make
-echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
-%endif
-
%build
-%{?with_apidocs:%{__gtkdocize}}
+%{__gtkdocize}
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- %{__enable_disable apidocs gtk-doc} \
- --with-html-dir=%{_gtkdocdir} \
- %{__disable static_libs static}
+ %{__disable apidocs gtk-doc} \
+ %{__disable static_libs static} \
+ --disable-silent-rules \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%attr(755,root,root) %{_libdir}/libdbus-glib-1.so
%{_libdir}/libdbus-glib-1.la
%{_mandir}/man1/dbus-binding-tool.1*
-%{_includedir}/dbus*/dbus/dbus-glib*.h
-%{_includedir}/dbus*/dbus/dbus-gtype-specialized.h
+%{_includedir}/dbus-1.0/dbus/dbus-glib*.h
+%{_includedir}/dbus-1.0/dbus/dbus-gtype-specialized.h
+%{_includedir}/dbus-1.0/dbus/dbus-gvalue-parse-variant.h
%{_pkgconfigdir}/dbus-glib-1.pc
%if %{with static_libs}