From 18109da94ea7ad96dd4fde1b453b67cc3effdcf9b998ac0a5e50c5e21fc73ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 11 Aug 2016 16:37:43 +0000 Subject: [PATCH] Accepting request 418653 from home:dimstar:u-a - Fix update-alterntatives usage. OBS-URL: https://build.opensuse.org/request/show/418653 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=240 --- gtk2.changes | 5 +++++ gtk2.spec | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gtk2.changes b/gtk2.changes index b560dce..b73cea1 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 11 10:14:03 UTC 2016 - dimstar@opensuse.org + +- Fix update-alterntatives usage. + ------------------------------------------------------------------- Sun Mar 6 10:56:37 UTC 2016 - zaitor@opensuse.org diff --git a/gtk2.spec b/gtk2.spec index 4ad3b4e..97911d2 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -370,12 +370,12 @@ touch %{buildroot}%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules.cache %if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/gtk-query-immodules-2.0 %{buildroot}%{_bindir}/gtk-query-immodules-2.0-64 %endif -# Alternatives for gtk-update-icon-cache +# 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-2.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-2.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 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm @@ -549,10 +549,12 @@ fi %defattr(-,root,root) %{_bindir}/gtk-query-immodules-2.0* %{_bindir}/gtk-update-icon-cache-2.0 -%ghost %{_bindir}/gtk-update-icon-cache -%{_mandir}/man1/gtk-query-immodules-2.0*.1* -%{_mandir}/man1/gtk-update-icon-cache-2.0.1* -%ghost %{_mandir}/man1/gtk-update-icon-cache.1* +%{_bindir}/gtk-update-icon-cache +%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache +%ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{?ext_man} +%{_mandir}/man1/gtk-query-immodules-2.0*.1%{?ext_man} +%{_mandir}/man1/gtk-update-icon-cache-2.0.1%{?ext_man} +%{_mandir}/man1/gtk-update-icon-cache.1%{?ext_man} %files data %defattr(-,root,root)