Accepting request 61079 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/61079
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=138
This commit is contained in:
Vincent Untz 2011-02-13 22:59:04 +00:00 committed by Git OBS Bridge
parent 36465d73c0
commit 1624b923d7
2 changed files with 10 additions and 26 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 13 22:05:38 CET 2011 - vuntz@opensuse.org
- Remove update-alternatives mechanism for gtk-builder-convert
since the tool is not in gtk3 anymore.
-------------------------------------------------------------------
Fri Jan 7 17:27:24 CET 2011 - vuntz@opensuse.org

View File

@ -338,16 +338,12 @@ touch %{buildroot}%{_sysconfdir}/gtk-2.0/gtk.immodules
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
# Alternatives for gtk-update-icon-cache
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
chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
@ -422,14 +418,6 @@ fi
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:
# - if it's an upgrade, it will have been called in post
@ -467,14 +455,6 @@ 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
@ -565,11 +545,9 @@ fi
%doc %{_datadir}/gtk-doc/html/gail-libgail-util/
%doc %{_datadir}/gtk-doc/html/gdk/
%doc %{_datadir}/gtk-doc/html/gtk/
%{_bindir}/gtk-builder-convert-2.0
%ghost %{_bindir}/gtk-builder-convert
%{_bindir}/gtk-builder-convert
%{_bindir}/gtk-demo
%{_mandir}/man1/gtk-builder-convert-2.0.1*
%ghost %{_mandir}/man1/gtk-builder-convert.1*
%{_mandir}/man1/gtk-builder-convert.1*
%{_datadir}/aclocal/gtk-2.0.m4
%{_datadir}/gir-1.0/*.gir
%dir %{_datadir}/gtk-2.0