From 9dbfd21d64cd28fc60f59f8b1c126be272a990d2c50cba931cae12dee67d886d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 11 Aug 2016 16:37:49 +0000 Subject: [PATCH] Accepting request 418655 from home:dimstar:u-a - Fix update-alternatives usage. OBS-URL: https://build.opensuse.org/request/show/418655 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=241 --- gtk3.changes | 5 +++++ gtk3.spec | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gtk3.changes b/gtk3.changes index 59ddda1..4efe752 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 11 11:04:51 UTC 2016 - dimstar@opensuse.org + +- Fix update-alternatives usage. + ------------------------------------------------------------------- Thu Aug 4 18:51:18 UTC 2016 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index e615761..f3049c0 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -372,12 +372,12 @@ mkdir %{buildroot}%{_libdir}/gtk-3.0/modules # create theming-engines directory that should have been created during the build test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines -# Alternatives for gtk-update-icon-cache and gtk-builder-convert +# Alternatives for gtk-update-icon-cache (binary and manpage) +mkdir -p %{buildroot}%{_sysconfdir}/alternatives mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0 +ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1 -touch %{buildroot}%{_bindir}/gtk-update-icon-cache -touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 -chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache +ln -s -f %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{ext_man} %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1%{ext_man} # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{S:3} %{buildroot}%{_sysconfdir}/rpm @@ -581,7 +581,8 @@ fi %{_bindir}/gtk-query-immodules-3.0* %{_bindir}/gtk-query-settings %{_bindir}/gtk-update-icon-cache-3.0 -%ghost %{_bindir}/gtk-update-icon-cache +%{_bindir}/gtk-update-icon-cache +%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache %{_datadir}/applications/gtk3-icon-browser.desktop %{_mandir}/man1/broadwayd.1%{?ext_man} %{_mandir}/man1/gtk3-icon-browser.1%{ext_man} @@ -590,8 +591,9 @@ fi %{_mandir}/man1/gtk-launch.1%{?ext_man} %{_mandir}/man1/gtk-query-immodules-3.0*.1* %{_mandir}/man1/gtk-query-settings.1%{?ext_man} -%{_mandir}/man1/gtk-update-icon-cache-3.0.1* -%ghost %{_mandir}/man1/gtk-update-icon-cache.1* +%{_mandir}/man1/gtk-update-icon-cache-3.0.1%{?ext_man} +%{_mandir}/man1/gtk-update-icon-cache.1%{?ext_man} +%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{?ext_man} %files data %defattr(-,root,root)