X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dbus-glib.spec;h=c08f97da8b7a15d208d3c8c175148f324210b64f;hb=HEAD;hp=6747fc4bc1f231b728165343d3fe8498f776558e;hpb=ddd7074982d3dc63766b93280ef778e9627575e7;p=packages%2Fdbus-glib.git

diff --git a/dbus-glib.spec b/dbus-glib.spec
index 6747fc4..b1f4375 100644
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -1,29 +1,35 @@
 #
-%define		dbus_version	0.94
+# Conditional build:
+%bcond_without	apidocs         # disable gtk-doc
+%bcond_without	static_libs	# don't build static library
+
+%define		dbus_version	1.8
 %define		expat_version	1:1.95.5
-%define		glib_version	1:2.10.1
-#
+%define		glib2_version	1:2.40
 Summary:	GLib-based library for using D-BUS
-Summary(pl.UTF-8):   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.72
-Release:	1
+Version:	0.112
+Release:	2
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
-Source0:	http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
-# Source0-md5:	6e92993aed234f13ea41c674dec40889
-Source1:	dbus-bus-introspect.xml
+Source0:	https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+# Source0-md5:	021e6c8a288df02c227e4aafbf7e7527
 Patch0:		%{name}-configure.patch
-Patch1:		%{name}-nolibs.patch
-URL:		http://www.freedesktop.org/Software/DBusBindings
+URL:		https://www.freedesktop.org/wiki/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:	glib2-devel >= %{glib_version}
-BuildRequires:	libtool
-BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.98
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= %{glib2_version}
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
+%{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.14}
+BuildRequires:	libtool >= 2:2
+BuildRequires:	pkgconfig >= 1:0.28
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.527
 Requires:	dbus-libs >= %{dbus_version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,7 +43,7 @@ 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.UTF-8):   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}
@@ -51,7 +57,7 @@ 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.UTF-8):   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}
 
@@ -63,9 +69,10 @@ 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
+Summary(pl.UTF-8):	Dokumentacja API D-BUS-GLib
 Group:		Documentation
 Requires:	gtk-doc-common
+BuildArch:	noarch
 
 %description apidocs
 D-BUS-GLib API documentation.
@@ -73,22 +80,34 @@ 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
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+#{__gtkdocize}
+#{__libtoolize}
+#{__aclocal}
+#{__autoconf}
+#{__autoheader}
+#{__automake}
 %configure \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-xml=expat
-
-cp %{SOURCE1} tools
+	%{__disable apidocs gtk-doc} \
+	%{__disable static_libs static} \
+	--disable-silent-rules \
+	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -96,7 +115,12 @@ cp %{SOURCE1} tools
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	profiledir=/etc/bash_completion.d
+
+%{__mv} $RPM_BUILD_ROOT/etc/bash_completion.d/{dbus-bash-completion.sh,dbus}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdbus-glib-1.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,22 +131,33 @@ 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
+%doc AUTHORS COPYING 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
-%{_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}
 %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) %{_libexecdir}/dbus-bash-completion-helper