From b541a2444e4a30c30fdebeb186e1b95f248413fb Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 18 Dec 2016 09:42:18 +0100
Subject: [PATCH] - added _soname_prov and journal_catalog_update macros - drop
 arm macro from macros.build (more recent version already defined in
 macros.rpmbuild) - version 1.721

---
 rpm-build-macros.spec |  2 +-
 rpm.macros            | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index d1f0176..70ef220 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.720
+%define		rpm_macros_rev	1.721
 %define		find_lang_rev	1.38
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 3f58c50..7c88d06 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -8,7 +8,6 @@
 
 %epoch		0
 %x8664		x86_64 amd64 ia32e
-%arm		armv3l armv4b armv4l armv5teb armv5tel
 
 # compiler version
 %cc_version	%{expand:%%global cc_version %(%{__cc} -dumpversion 2>/dev/null || echo 0.0)}%cc_version
@@ -767,6 +766,15 @@ __spec_install_post_check_shebangs() { \
 %{?pdir:rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/%{pdir}%{?pnam:/%(echo %{pnam} | tr - /)}/.packlist}} \
 } }
 
+# Helpers to specify SONAME depdendencies, e.g.:
+#   Requires: %{_soname_prov libfoo.so.1}
+#   Requires: %{_soname_prov libfoo.so.1(SOME_SYMVER)}
+#
+# BuildRequires:	rpmbuild(macros) >= 1.721
+#
+%_soname_tag %(echo %{_lib} | sed -e 's/^lib//' -e 's/^\\(.\\+\\)$/(\\1bit)/')
+%_soname_prov() %(echo "%{1}()%{_soname_tag}" | sed -e 's/^\\([^(]*([^)]\\+)\\)()%{_soname_tag}$/\\1%{_soname_tag}/;s/()$//')
+
 #-----------------------------------------------------------------
 # Update GConf2 schemas
 #
@@ -2276,6 +2284,9 @@ want_enable_service() { \
 %systemduserunitdir /usr/lib/systemd/user
 %systemdtmpfilesdir /usr/lib/tmpfiles.d
 
+# BuildRequires:	rpmbuild(macros) >= 1.721
+%journal_catalog_update() [ ! -x /bin/journalctl ] || /bin/journalctl --update-catalog >/dev/null 2>&1 || :
+
 #-----------------------------------------------------------------
 # Update hardware database index
 #
-- 
2.44.0