From add81972b4df99aa5bdcfe9ebd86363e12b73651 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 1 Mar 2022 01:22:01 +0100 Subject: [PATCH] up to 1.14.0 --- dbus-allow-introspection.patch | 4 ++-- dbus-no_fatal_checks.patch | 4 ++-- dbus-nolibs.patch | 13 ++----------- dbus.spec | 12 +++++++----- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dbus-allow-introspection.patch b/dbus-allow-introspection.patch index 358dacf..900edaa 100644 --- a/dbus-allow-introspection.patch +++ b/dbus-allow-introspection.patch @@ -10,8 +10,8 @@ ---- dbus-1.2.10/test/name-test/tmp-session-like-system.conf.orig 2008-12-19 20:39:55.000000000 +0100 -+++ dbus-1.2.10/test/name-test/tmp-session-like-system.conf 2008-12-26 09:42:41.950513830 +0100 +--- dbus-1.2.10/test/data/valid-config-files-system/tmp-session-like-system.conf.in.orig 2008-12-19 20:39:55.000000000 +0100 ++++ dbus-1.2.10/test/data/valid-config-files-system/tmp-session-like-system.conf.in 2008-12-26 09:42:41.950513830 +0100 @@ -24,6 +24,10 @@ diff --git a/dbus-no_fatal_checks.patch b/dbus-no_fatal_checks.patch index c5aa3a5..3550114 100644 --- a/dbus-no_fatal_checks.patch +++ b/dbus-no_fatal_checks.patch @@ -2,8 +2,8 @@ diff -urN dbus-1.0.2.orig/dbus/dbus-internals.c dbus-1.0.2/dbus/dbus-internals.c --- dbus-1.0.2.orig/dbus/dbus-internals.c 2007-03-04 19:25:33.503538844 +0100 +++ dbus-1.0.2/dbus/dbus-internals.c 2007-03-04 19:25:47.572571912 +0100 @@ -193,7 +193,7 @@ - - static dbus_bool_t warn_initted = FALSE; + * threads, the worst that will happen is that warnings get their default + * fatal/non-fatal nature. */ static dbus_bool_t fatal_warnings = FALSE; -static dbus_bool_t fatal_warnings_on_check_failed = TRUE; +static dbus_bool_t fatal_warnings_on_check_failed = FALSE; diff --git a/dbus-nolibs.patch b/dbus-nolibs.patch index 0e18140..a075e72 100644 --- a/dbus-nolibs.patch +++ b/dbus-nolibs.patch @@ -8,14 +8,5 @@ diff -urNp -x '*.orig' dbus-1.12.20.org/configure.ac dbus-1.12.20/configure.ac -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 setlocale localeconv strtoll strtoull issetugid getresuid setresuid getrlimit prlimit]) - -@@ -1209,7 +1209,7 @@ else - 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 + AC_CHECK_HEADERS([syslog.h]) + if test "x$ac_cv_header_syslog_h" = "xyes"; then diff --git a/dbus.spec b/dbus.spec index 8bed7b0..743bb5a 100644 --- a/dbus.spec +++ b/dbus.spec @@ -12,12 +12,12 @@ Summary: D-BUS message bus Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS Name: dbus -Version: 1.12.20 -Release: 3 +Version: 1.14.0 +Release: 1 License: AFL v2.1 or GPL v2+ Group: Libraries -Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz -# Source0-md5: dfe8a71f412e0b53be26ed4fbfdc91c4 +Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz +# Source0-md5: ddd5570aff05191dbee8e42d751f1b7d Source1: messagebus.init Source2: %{name}-daemon-1-profile.d-sh Source3: %{name}-sysconfig @@ -47,8 +47,10 @@ BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 2.011 BuildRequires: sed >= 4.0 %{?with_systemd:BuildRequires: systemd-devel >= 32} +BuildRequires: tar >= 1:1.22 BuildRequires: xmlto %{?with_X11:BuildRequires: xorg-lib-libX11-devel} +BuildRequires: xz BuildRequires: yelp-tools Requires(post,postun): /sbin/ldconfig Requires(post,preun): /sbin/chkconfig @@ -299,7 +301,7 @@ fi %files libs %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog NEWS README doc/TODO +%doc AUTHORS CONTRIBUTING.md COPYING NEWS README doc/TODO %attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libdbus-1.so.3 %dir %{_datadir}/dbus-1 -- 2.44.0