From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 21 Apr 2011 17:34:36 +0000 (+0000)
Subject: - updated to 1.4.8
X-Git-Tag: auto/th/dbus-1_4_8-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=38d51c467dc513e77e1d56200819462f503ca990;p=packages%2Fdbus.git

- updated to 1.4.8
- updated nolibs patch

Changed files:
    dbus-nolibs.patch -> 1.7
    dbus.spec -> 1.213
---

diff --git a/dbus-nolibs.patch b/dbus-nolibs.patch
index 5a785a9..965f9ae 100644
--- a/dbus-nolibs.patch
+++ b/dbus-nolibs.patch
@@ -1,21 +1,20 @@
-diff -urN dbus-1.2.20/configure.in dbus-1.2.20.new/configure.in
---- dbus-1.2.20/configure.in	2010-02-03 18:09:08.000000000 +0100
-+++ dbus-1.2.20.new/configure.in	2010-02-07 14:58:43.761263087 +0100
-@@ -387,7 +387,7 @@
+--- dbus-1.4.8/configure.ac.orig	2011-04-08 15:29:57.000000000 +0200
++++ dbus-1.4.8/configure.ac	2011-04-21 19:19:14.669374081 +0200
+@@ -457,7 +457,7 @@
  
  #### Various functions
  AC_SEARCH_LIBS(socket,[socket network])
 -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 +AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname,nsl)])
  
- AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll)
+ AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull)
  
-@@ -917,7 +917,7 @@
- 
- if test x$enable_x11 = xyes ; then
-    AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])
--   DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-+   DBUS_X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
-    DBUS_X_CFLAGS="$X_CFLAGS"
- else
-    DBUS_X_LIBS=
+@@ -1086,7 +1086,7 @@
+         have_x11=no
+     else
+         have_x11=yes
+-        DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++        DBUS_X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
+         DBUS_X_CFLAGS="$X_CFLAGS"
+     fi
+ fi
diff --git a/dbus.spec b/dbus.spec
index 4a5d920..5f8e397 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -7,12 +7,12 @@
 Summary:	D-BUS message bus
 Summary(pl.UTF-8):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
-Version:	1.4.6
+Version:	1.4.8
 Release:	1
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5:	99b165f727dd8a5c4b7e2c20a8bf5db6
+# Source0-md5:	e30253e15f0f4e6c5ee9e6f0eba5046c
 Source1:	messagebus.init
 Source2:	%{name}-daemon-1-profile.d-sh
 Source3:	%{name}-sysconfig
@@ -24,13 +24,13 @@ Patch2:		%{name}-no_fatal_checks.patch
 Patch3:		%{name}-allow-introspection.patch
 URL:		http://www.freedesktop.org/Software/dbus
 BuildRequires:	audit-libs-devel
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.10
 BuildRequires:	doxygen
 BuildRequires:	expat-devel >= %{expat_version}
 BuildRequires:	libcap-ng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.561
 BuildRequires:	sed >= 4.0
@@ -174,6 +174,8 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libdbus-1.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libdbus-1.so
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dbus/api
+
 %clean
 rm -rf $RPM_BUILD_ROOT