rdieter pushed to kf5-kinit (f21). "devel: add %{kf5_kinit_requires} macro"

[notifications at fedoraproject.org]

From 0a706b6dabd2a187ea7e4cb80fef33a9846211ed Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 1 Jun 2015 11:36:16 -0500
Subject: devel: add %{kf5_kinit_requires} macro


diff --git a/kf5-kinit.spec b/kf5-kinit.spec
index 32db172..c701840 100644
--- a/kf5-kinit.spec
+++ b/kf5-kinit.spec
@@ -1,8 +1,9 @@
 %global framework kinit
+%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           kf5-%{framework}
 Version:        5.10.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE Frameworks 5 tier 3 solution for process launching
 
 License:        LGPLv2+ and BSD
@@ -17,6 +18,8 @@ URL:            http://www.kde.org
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
+Source10:       macros.kf5-kinit
+
 # backport hack to workaround klauncher/SM issues, see bug http://bugzilla.redhat.com/983110
 Patch1:  kinit-5.10.0-klauncher-qt_no_glib.patch
 
@@ -72,6 +75,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang kinit5_qt --with-man --with-qt --all-name
 
+# rpm macros
+install -p -m644 -D %{SOURCE10} \
+  %{buildroot}%{rpm_macros_dir}/macros.%{name}
+
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -86,9 +93,13 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %files devel
 %{_kf5_libdir}/cmake/KF5Init/
 %{_kf5_datadir}/dbus-1/interfaces/*.xml
+%{rpm_macros_dir}/macros.%{name}
 
 
 %changelog
+* Mon Jun 01 2015 Rex Dieter <rdieter at fedoraproject.org> 5.10.0-3
+- -devel: add %%{kf5_kinit_requires} macro
+
 * Wed May 20 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.10.0-2
 - .spec cosmetics
 - Backport klauncher QT_NO_GLIB hack (#983110)
diff --git a/macros.kf5-kinit b/macros.kf5-kinit
new file mode 100644
index 0000000..b7c3c30
--- /dev/null
+++ b/macros.kf5-kinit
@@ -0,0 +1,4 @@
+
+%kf5_kinit_requires \
+Requires: kf5-kinit%{?_isa}\
+%{nil}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kf5-kinit.git/commit/?h=f21&id=0a706b6dabd2a187ea7e4cb80fef33a9846211ed