- updated to 0.98

[packages/dbus-glib.git] / dbus-glib.spec

diff --git a/dbus-glib.spec b/dbus-glib.spec
index dc8091f1a73c8a5c77416912d4c90353b6bb566b..c718484e1922adc52646d19f64162c142c068c8b 100644 (file)
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -2,34 +2,33 @@
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
 %bcond_without static_libs     # don't build static library
-#
-%define                dbus_version    0.93
+
+%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.76
+Version:       0.98
 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: d3b716a7e798faa1c6a867675f00306a
-Source1:       dbus-bus-introspect.xml
+# Source0-md5: 3f7f117dc7c8d899d9acfdcbf9253fb8
 Patch0:                %{name}-configure.patch
-Patch1:                %{name}-nolibs.patch
 URL:           http://www.freedesktop.org/Software/DBusBindings
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9
 BuildRequires: dbus-devel >= %{dbus_version}
+%{?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}
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.98
+BuildRequires: rpmbuild(macros) >= 1.527
 Requires:      dbus-libs >= %{dbus_version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,29 +78,39 @@ 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 !%{with apidocs}
+%if %{without apidocs}
 echo 'EXTRA_DIST=' > gtk-doc.make
 echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
 %endif
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__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
+       %{__enable_disable apidocs gtk-doc} \
+       %{__disable static_libs static} \
+       --disable-silent-rules \
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -109,7 +118,10 @@ 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
@@ -129,8 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dbus-binding-tool
 %attr(755,root,root) %{_libdir}/libdbus-glib-1.so
 %{_libdir}/libdbus-glib-1.la
-%{_includedir}/dbus*/dbus/dbus-glib*.h
-%{_includedir}/dbus*/dbus/dbus-gtype-specialized.h
+%{_mandir}/man1/dbus-binding-tool.1*
+%{_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}
@@ -144,3 +158,8 @@ rm -rf $RPM_BUILD_ROOT
 %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