commit gtk2 for openSUSE:Factory
Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at Fri Jan 14 16:18:14 CET 2011. -------- --- GNOME/gtk2/gtk2.changes 2010-12-14 19:16:28.000000000 +0100 +++ gtk2/gtk2.changes 2011-01-07 17:38:10.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Jan 7 17:27:24 CET 2011 - vuntz@opensuse.org + +- Use update-alternatives mechanism for gtk-update-icon-cache and + gtk-builder-convert since both tools are shipped with the same + names in gtk2 and gtk3: + + Rename the non-versioned tools and man pages to versioned + filenames. + + Add update-alternatives Requires(post/postun) to tools and + devel subpackages. + + Call update-alterantives in %post/%postun of the tools and + devel subpackages. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.RJ3FYK/_old 2011-01-14 16:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.RJ3FYK/_new 2011-01-14 16:17:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gtk2 (Version 2.22.1) +# spec file for package gtk2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: gtk2 %define _name gtk+ Version: 2.22.1 -Release: 4 +Release: 5 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) @@ -231,6 +231,8 @@ License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Tools Group: System/Libraries +Requires(post): update-alternatives +Requires(postun): update-alternatives %description tools GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -268,6 +270,8 @@ Requires: libgtk-2_0-0 = %{version} # gtk-builder-convert needs this. Requires: python-xml +Requires(post): update-alternatives +Requires(postun): update-alternatives # gail is part of gtk+ as of 2.13.x Provides: gail-devel = 1.22.1 Obsoletes: gail-devel < 1.22.1 @@ -334,6 +338,16 @@ mv %{buildroot}%{_bindir}/gtk-query-immodules-2.0 %{buildroot}%{_bindir}/gtk-query-immodules-2.0-64 mv %{buildroot}%{_sysconfdir}/gtk-2.0/gtk.immodules %{buildroot}%{_sysconfdir}/gtk-2.0/gtk64.immodules %endif +# Alternatives for gtk-update-icon-cache and gtk-builder-convert +mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-2.0 +mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-2.0.1 +mv %{buildroot}%{_bindir}/gtk-builder-convert %{buildroot}%{_bindir}/gtk-builder-convert-2.0 +mv %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 %{buildroot}%{_mandir}/man1/gtk-builder-convert-2.0.1 +touch %{buildroot}%{_bindir}/gtk-update-icon-cache +touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 +touch %{buildroot}%{_bindir}/gtk-builder-convert +touch %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 +chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-builder-convert # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{S:5} %{buildroot}%{_sysconfdir}/rpm @@ -401,6 +415,20 @@ %{_gtk_query_immodules_update_cache} fi fi +%if 0 +# If the gtk-update-icon-cache group is in automatic mode, then this will also +# switch all symlinks automatically +%endif +update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-2.0 2 \ + --slave %{_mandir}/man1/gtk-update-icon-cache.1.gz gtk-update-icon-cache.1.gz %{_mandir}/man1/gtk-update-icon-cache-2.0.1.gz + +%post devel +%if 0 +# If the gtk-builder-convert group is in automatic mode, then this will also +# switch all symlinks automatically +%endif +update-alternatives --install %{_bindir}/gtk-builder-convert gtk-builder-convert %{_bindir}/gtk-builder-convert-2.0 2 \ + --slave %{_mandir}/man1/gtk-builder-convert.1.gz gtk-builder-convert.1.gz %{_mandir}/man1/gtk-builder-convert-2.0.1.gz %if 0 # No need to call gtk-query-immodules-2.0 in postun: @@ -431,6 +459,22 @@ %postun immodule-xim %{_gtk_query_immodules_update_cache} +%postun tools +%if 0 +# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed +%endif +if [ ! -f %{_bindir}/gtk-update-icon-cache-2.0 ]; then + update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-2.0 +fi + +%postun devel +%if 0 +# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed +%endif +if [ ! -f %{_bindir}/gtk-builder-convert-2.0 ]; then + update-alternatives --remove gtk-builder-convert %{_bindir}/gtk-builder-convert-2.0 +fi + %files -n libgtk-2_0-0 %defattr(-,root,root) %doc AUTHORS COPYING README NEWS ChangeLog @@ -498,9 +542,11 @@ %files tools %defattr(-,root,root) %{_bindir}/gtk-query-immodules-2.0* -%{_bindir}/gtk-update-icon-cache +%{_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.1* +%{_mandir}/man1/gtk-update-icon-cache-2.0.1* +%ghost %{_mandir}/man1/gtk-update-icon-cache.1* %files data %defattr(-,root,root) @@ -519,9 +565,11 @@ %doc %{_datadir}/gtk-doc/html/gail-libgail-util/ %doc %{_datadir}/gtk-doc/html/gdk/ %doc %{_datadir}/gtk-doc/html/gtk/ -%{_bindir}/gtk-builder-convert +%{_bindir}/gtk-builder-convert-2.0 +%ghost %{_bindir}/gtk-builder-convert %{_bindir}/gtk-demo -%doc %{_mandir}/man1/gtk-builder-convert.1* +%{_mandir}/man1/gtk-builder-convert-2.0.1* +%ghost %{_mandir}/man1/gtk-builder-convert.1* %{_datadir}/aclocal/gtk-2.0.m4 %{_datadir}/gir-1.0/*.gir %dir %{_datadir}/gtk-2.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de