#
-%define dbus_version 0.91
+# Conditional build:
+%bcond_without apidocs # disable gtk-doc
+%bcond_without static_libs # don't build static library
+#
+%define dbus_version 1.1
%define expat_version 1:1.95.5
%define glib_version 1:2.10.1
#
Summary: GLib-based library for using D-BUS
-Summary(pl): Biblioteka do u¿ywania D-BUS oparta o GLib
+Summary(pl.UTF-8): Biblioteka do używania D-BUS oparta o GLib
Name: dbus-glib
-Version: 0.71
-Release: 2
+Version: 0.82
+Release: 1
License: AFL v2.1 or GPL v2
Group: Libraries
-Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 4e1e7348b26ee8b6485452113f4221cc
+Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+# Source0-md5: aa2a4517de0e9144be3bce2cf8cdd924
Source1: dbus-bus-introspect.xml
Patch0: %{name}-configure.patch
-Patch1: %{name}-nolibs.patch
-URL: http://www.freedesktop.org/Software/dbus
+Patch1: %{name}-as-needed.patch
+URL: http://www.freedesktop.org/Software/DBusBindings
BuildRequires: autoconf >= 2.52
-BuildRequires: automake
+BuildRequires: automake >= 1:1.9
BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: expat-devel >= %{expat_version}
+BuildRequires: gettext-devel
BuildRequires: glib2-devel >= %{glib_version}
+%{?with_apidocs:BuildRequires: gtk-doc-automake >= 1.8}
BuildRequires: libtool
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.98
Requires: dbus-libs >= %{dbus_version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
D-BUS add-on library to integrate the standard D-BUS library with the
GLib thread abstraction and main loop.
-%description -l pl
+%description -l pl.UTF-8
Dodatkowa biblioteka D-BUS do integracji standardowej biblioteki D-BUS
-z abstrakcj± w±tków i g³ówn± pêtl± GLib.
+z abstrakcją wątków i główną pętlą GLib.
%package devel
Summary: Header files for GLib-based library for using D-BUS
-Summary(pl): Pliki nag³ówkowe biblioteki do u¿ywania D-BUS opartej o GLib
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki do używania D-BUS opartej o GLib
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel >= %{dbus_version}
%description devel
Header files for GLib-based library for using D-BUS.
-%description devel -l pl
-Pliki nag³ówkowe biblioteki do u¿ywania D-BUS opartej o GLib.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki do używania D-BUS opartej o GLib.
%package static
Summary: Static GLib-based library for using D-BUS
-Summary(pl): Statyczna biblioteka do u¿ywania D-BUS oparta o GLib
+Summary(pl.UTF-8): Statyczna biblioteka do używania D-BUS oparta o GLib
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
Static GLib-based library for using D-BUS.
-%description static -l pl
-Statyczna biblioteka do u¿ywania D-BUS oparta o GLib.
+%description static -l pl.UTF-8
+Statyczna biblioteka do używania D-BUS oparta o GLib.
+
+%package apidocs
+Summary: D-BUS-GLib API documentation
+Summary(pl.UTF-8): Dokumentacja API D-BUS-GLib
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+D-BUS-GLib API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API D-BUS-GLib.
+
+%package -n bash-completion-dbus
+Summary: bash-completion for dbus-send
+Summary(pl.UTF-8): Bashowe uzupełnianie poleceń dla dbus-send
+Group: Applications/Shells
+Requires: bash-completion
+
+%description -n bash-completion-dbus
+This package provides bash-completion for dbus-send.
+
+%description -n bash-completion-dbus -l pl.UTF-8
+Ten pakiet dostarcza bashowe uzupełnianie poleceń dla dbus-send.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+%if %{without apidocs}
+echo 'EXTRA_DIST=' > gtk-doc.make
+echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%endif
+
%build
%{__libtoolize}
%{__aclocal}
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_apidocs:--disable-gtk-doc} \
+ %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+ %{!?with_static_libs:--disable-static} \
--with-xml=expat
cp %{SOURCE1} tools
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ profiledir=/etc/bash_completion.d
+
+mv -f $RPM_BUILD_ROOT/etc/bash_completion.d/{dbus-bash-completion.sh,dbus}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
+# AFL not in common-licenses, so COPYING included
+%doc AUTHORS COPYING ChangeLog NEWS README
%attr(755,root,root) %{_libdir}/libdbus-glib-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdbus-glib-1.so.2
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/dbus-binding-tool
%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
%{_pkgconfigdir}/dbus-glib-1.pc
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libdbus-glib-1.a
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/dbus-glib
+%endif
+
+%files -n bash-completion-dbus
+%defattr(644,root,root,755)
+/etc/bash_completion.d/dbus
+%attr(755,root,root) %{_libdir}/dbus-bash-completion-helper