From d8f46c5f20e76946b0f993eeed15bdd9535a6d61 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 14 2015 17:29:25 +0000 Subject: hard-code mc_plugindir macro, add %check to verify correctness --- diff --git a/telepathy-mission-control.spec b/telepathy-mission-control.spec index 24246b3..63b0e65 100644 --- a/telepathy-mission-control.spec +++ b/telepathy-mission-control.spec @@ -1,8 +1,10 @@ %define tp_glib_ver 0.17.5 +%global mc_plugindir %{_libdir}/mission-control-plugins.0 + Name: telepathy-mission-control Version: 5.16.3 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: Central control for Telepathy connection manager @@ -63,20 +65,19 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%global mc_plugindir %(PKGCONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig pkg-config --variable=plugindir mission-control-plugins 2>/dev/null) - # create/own plugin dir mkdir -p %{buildroot}%{mc_plugindir} # Remove rpaths if present chrpath --list %{buildroot}%{_libexecdir}/mission-control-5 && \ chrpath --delete %{buildroot}%{_libexecdir}/mission-control-5 - # Remove .la files rm -fv %{buildroot}%{_libdir}/lib*.la %check +PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +test "%{?mc_plugindir}" = "$(pkg-config --variable=plugindir mission-control-plugins 2>/dev/null)" make check ||: @@ -103,7 +104,7 @@ fi %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service %{_datadir}/glib-2.0/schemas/im.telepathy.MissionControl.FromEmpathy.gschema.xml %{_libdir}/libmission-control-plugins.so.0* -%dir %{mc_plugindir}/ +%dir %{mc_plugindir} %{_libexecdir}/mission-control-5 %{_mandir}/man1/mc-tool.1* %{_mandir}/man1/mc-wait-for-name.1* @@ -117,6 +118,9 @@ fi %changelog +* Wed Oct 14 2015 Rex Dieter 1:5.16.3-5 +- hard-code mc_plugindir macro, add %%check to verify correctness + * Wed Oct 14 2015 Rex Dieter - 1:5.16.3-4 - -devel: tighten subpkg dep via %%{?_isa}, rely on pkgconfig auto deps - tighten file lists, track libsoname