- updated to 1.12.12

- added autoconf-archive patch (adapt to current autoconf-archive macros)

diff --git a/dbus-autoconf-archive.patch b/dbus-autoconf-archive.patch
new file mode 100644 (file)
index 0000000..e4d1509
--- /dev/null
+++ b/dbus-autoconf-archive.patch
@@ -0,0 +1,45 @@
+--- dbus-1.12.12/configure.ac.orig     2019-02-13 21:45:13.880746757 +0100
++++ dbus-1.12.12/configure.ac  2019-02-13 21:51:22.655415600 +0100
+@@ -12,6 +12,7 @@
+ 
+ m4_pattern_forbid([^AX_],
+   [Unexpanded AX_ macro found. Please install GNU autoconf-archive])
++m4_pattern_allow([AX_CHECK_GNU_MAKE_HEADLINE])
+ 
+ AC_CANONICAL_HOST
+ 
+--- dbus-1.12.12/Makefile.am.orig      2018-12-04 12:13:44.000000000 +0100
++++ dbus-1.12.12/Makefile.am   2019-02-13 22:16:52.360461810 +0100
+@@ -51,4 +51,4 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
++include $(top_srcdir)/aminclude_static.am
+--- dbus-1.12.12/dbus/Makefile.am.orig 2017-10-30 13:26:18.000000000 +0100
++++ dbus-1.12.12/dbus/Makefile.am      2019-02-13 22:17:08.080376648 +0100
+@@ -329,7 +329,7 @@
+ test_dbus_LDADD = libdbus-internal.la
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
++include $(top_srcdir)/aminclude_static.am
+ 
+ clean-local:
+       $(AM_V_at)rm -fr ./.dbus-keyrings
+--- dbus-1.12.12/test/Makefile.am.orig 2018-02-23 11:25:17.000000000 +0100
++++ dbus-1.12.12/test/Makefile.am      2019-02-13 22:17:22.976962612 +0100
+@@ -672,4 +672,4 @@
+       ) > $@.tmp && mv $@.tmp $@
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
++include $(top_srcdir)/aminclude_static.am
+--- dbus-1.12.12/bus/Makefile.am.orig  2017-10-30 13:26:18.000000000 +0100
++++ dbus-1.12.12/bus/Makefile.am       2019-02-13 22:17:40.393534925 +0100
+@@ -306,4 +306,4 @@
+ endif
+ 
+ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE
+-@CODE_COVERAGE_RULES@
++include $(top_srcdir)/aminclude_static.am

diff --git a/dbus.spec b/dbus.spec
index f2b2932dd6ac0ebd9be422bee212cb35b742132a..41012277da1cb44081a0e4917fa9b84f15c15ea4 100644 (file)
--- 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.10
+Version:       1.12.12
 Release:       1
 License:       AFL v2.1 or GPL v2+
 Group:         Libraries
 Source0:       https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: c3e12b4206e2a7da39d7cc42567790ef
+# Source0-md5: ea11069521beeee4e47f0086596a43c8
 Source1:       messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
@@ -27,9 +27,11 @@ Patch0:              %{name}-nolibs.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-no_fatal_checks.patch
 Patch3:                %{name}-allow-introspection.patch
+Patch4:                %{name}-autoconf-archive.patch
 URL:           https://www.freedesktop.org/Software/dbus
 BuildRequires: audit-libs-devel
 BuildRequires: autoconf >= 2.63
+BuildRequires: autoconf-archive >= 2019.01.06
 BuildRequires: automake >= 1:1.13
 BuildRequires: docbook-dtd44-xml
 BuildRequires: doxygen
@@ -156,6 +158,7 @@ D-BUS wraz z sesją X11 użytkownika.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}