- don't explicitly enable docs rebuilding, it's broken; but package apidocs by default

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

diff --git a/dbus-glib.spec b/dbus-glib.spec
index 6d9e21e359704d77fffdc86e76ed1711e678871e..921f125688abf16e3a3f5e3953ab0f49b51bc292 100644 (file)
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -2,34 +2,34 @@
 # 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.78
+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: d4aa04b9df35b4bd663be38e959941c8
-Source1:       dbus-bus-introspect.xml
+# 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
 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)
 
@@ -96,24 +96,18 @@ Ten pakiet dostarcza bashowe uzupełnianie poleceń dla dbus-send.
 %patch0 -p1
 %patch1 -p1
 
-%if %{without apidocs}
-echo 'EXTRA_DIST=' > gtk-doc.make
-echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
-%endif
-
 %build
+%{__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
+       %{__disable apidocs gtk-doc} \
+       %{__disable static_libs static} \
+       --disable-silent-rules \
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -144,8 +138,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}