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

diff --git a/dbus-glib.spec b/dbus-glib.spec
index 5c88b73..b1f4375 100644
--- a/dbus-glib.spec
+++ b/dbus-glib.spec
@@ -1,33 +1,34 @@
 #
 # Conditional build:
-%bcond_with	apidocs         # disable gtk-doc
+%bcond_without	apidocs         # disable gtk-doc
 %bcond_without	static_libs	# don't build static library
 
-%define		dbus_version	1.2.16
+%define		dbus_version	1.8
 %define		expat_version	1:1.95.5
-%define		glib2_version	1:2.26
+%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
 Name:		dbus-glib
-Version:	0.100
-Release:	3
+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:	d33959a9c0c6a158f5ac6d640316e89e
+Source0:	https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
+# Source0-md5:	021e6c8a288df02c227e4aafbf7e7527
 Patch0:		%{name}-configure.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:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= %{glib2_version}
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
-%{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.8}
-BuildRequires:	libtool
-BuildRequires:	pkgconfig
+%{?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)
@@ -71,6 +72,7 @@ Summary:	D-BUS-GLib API documentation
 Summary(pl.UTF-8):	Dokumentacja API D-BUS-GLib
 Group:		Documentation
 Requires:	gtk-doc-common
+BuildArch:	noarch
 
 %description apidocs
 D-BUS-GLib API documentation.
@@ -95,14 +97,14 @@ Ten pakiet dostarcza bashowe uzupełnianie poleceń dla dbus-send.
 %patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
+#{__gtkdocize}
+#{__libtoolize}
+#{__aclocal}
+#{__autoconf}
+#{__autoheader}
+#{__automake}
 %configure \
-	%{__enable_disable apidocs gtk-doc} \
+	%{__disable apidocs gtk-doc} \
 	%{__disable static_libs static} \
 	--disable-silent-rules \
 	--with-html-dir=%{_gtkdocdir}
@@ -116,7 +118,9 @@ rm -rf $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}
+%{__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
@@ -127,7 +131,7 @@ 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
 
@@ -135,7 +139,6 @@ rm -rf $RPM_BUILD_ROOT
 %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-1.0/dbus/dbus-glib*.h
 %{_includedir}/dbus-1.0/dbus/dbus-gtype-specialized.h
@@ -157,4 +160,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bash-completion-dbus
 %defattr(644,root,root,755)
 /etc/bash_completion.d/dbus
-%attr(755,root,root) %{_libdir}/dbus-bash-completion-helper
+%attr(755,root,root) %{_libexecdir}/dbus-bash-completion-helper