From 34acf32b33b31e075b7dbee3234c2896cc78928a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Nov 2016 17:56:38 +0900 Subject: [PATCH] Create and own indicatordir, iconsdir (bug 1392864) --- libindicator.spec | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/libindicator.spec b/libindicator.spec index 0a23f0c..ae44955 100644 --- a/libindicator.spec +++ b/libindicator.spec @@ -1,6 +1,6 @@ Name: libindicator Version: 12.10.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Shared functions for Ayatana indicators Group: System Environment/Libraries @@ -134,10 +134,35 @@ popd pushd build-gtk2 make install DESTDIR=%{buildroot} popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator-0.4) + mkdir -p %{buildroot}${vardir} + done +) pushd build-gtk3 make install DESTDIR=%{buildroot} popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkg-config + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator3-0.4) + mkdir -p %{buildroot}${vardir} + done +) + # Ubuntu doesn't package the dummy indicator @@ -160,7 +185,9 @@ find %{buildroot} -type f -name '*.la' -delete %files %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator.so.* - +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ +%{_libdir}/indicators/ %files devel %dir %{_includedir}/libindicator-0.4/ @@ -172,13 +199,15 @@ find %{buildroot} -type f -name '*.la' -delete %files tools %{_libexecdir}/indicator-loader -%dir %{_datadir}/libindicator/ %{_datadir}/libindicator/80indicator-debugging %files gtk3 %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/libindicator3.so.* +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ +%{_libdir}/indicators3/ %files gtk3-devel @@ -193,6 +222,9 @@ find %{buildroot} -type f -name '*.la' -delete %{_libexecdir}/indicator-loader3 %changelog +* Tue Nov 15 2016 Mamoru TASAKA - 12.10.1-8 +- Create and own indicatordir, iconsdir (bug 1392864) + * Thu Feb 4 2016 Mamoru TASAKA - 12.10.1-7 - F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change)