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

revert some spec-cleaner breakage

OBS-URL: https://build.opensuse.org/request/show/133304
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=174

gtk2.spec

@@ -52,6 +52,7 @@ Patch24:        gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d
 # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
 Patch53:        gtk-path-local.patch
 BuildRequires:  atk-devel
+BuildRequires:  cairo-devel
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -62,10 +63,9 @@ BuildRequires:  gnome-patch-translation
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  pango-devel
 BuildRequires:  translation-update-upstream
-BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xcursor)
@@ -86,6 +86,7 @@ ranging from small one-off projects to complete application suites.
 %package -n libgtk-2_0-0
 Summary:        The GTK+ toolkit library (version 2)
 Group:          System/Libraries
+Requires(post): %{name}-tools
 # While hicolor is not a Requires strictly speaking, we put it as
 # such instead of as a Recommends because many applications just
 # assume it's there and we need to have a low-level package to
@@ -108,7 +109,6 @@ Obsoletes:      %{name} < %{version}
 # gail is part of gtk+ as of 2.13.x
 Provides:       gail = 1.22.1
 Obsoletes:      gail < 1.22.1
-Requires(post): %{name}-tools
 # bug437293
 %ifarch ppc64
 Obsoletes:      gtk2-64bit
@@ -135,9 +135,9 @@ This package provides the GObject Introspection bindings for GTK+.
 Summary:        The GTK+ toolkit library (version 2) -- Amharic Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
-Provides:       locale(%{name}:am)
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+Provides:       locale(%{name}:am)
 
 %description immodule-amharic
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -150,9 +150,9 @@ This package provides an input method for Amharic.
 Summary:        The GTK+ toolkit library (version 2) -- Inuktitut Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
-Provides:       locale(%{name}:iu)
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+Provides:       locale(%{name}:iu)
 
 %description immodule-inuktitut
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -180,10 +180,10 @@ multi-press method, as on a mobile phone.
 Summary:        The GTK+ toolkit library (version 2) -- Thai-Lao Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
-Provides:       locale(%{name}:lo)
-Provides:       locale(%{name}:th)
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+Provides:       locale(%{name}:lo)
+Provides:       locale(%{name}:th)
 
 %description immodule-thai
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -196,9 +196,9 @@ This package provides an input method for Thai-Lao.
 Summary:        The GTK+ toolkit library (version 2) -- Tigrigna Input Methods
 Group:          System/Libraries
 Requires:       %{name} = %{version}
-Provides:       locale(%{name}:ti)
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+Provides:       locale(%{name}:ti)
 
 %description immodules-tigrigna
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -211,9 +211,9 @@ This package provides two input methods for Tigrigna.
 Summary:        The GTK+ toolkit library (version 2) -- Vietnamese Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
-Provides:       locale(%{name}:vi)
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+Provides:       locale(%{name}:vi)
 
 %description immodule-vietnamese
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -226,12 +226,12 @@ This package provides an input method for Vietnamese.
 Summary:        The GTK+ toolkit library (version 2) -- X Input Method
 Group:          System/Libraries
 Requires:       %{name} = %{version}
+Requires(post): %{name}-tools
+Requires(postun): %{name}-tools
 Provides:       locale(%{name}:ja)
 Provides:       locale(%{name}:ko)
 Provides:       locale(%{name}:th)
 Provides:       locale(%{name}:zh)
-Requires(post): %{name}-tools
-Requires(postun): %{name}-tools
 
 %description immodule-xim
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -265,10 +265,10 @@ ranging from small one-off projects to complete application suites.
 Summary:        The GTK+ toolkit library (version 2) -- Upstream theme configuration
 Group:          System/Libraries
 Requires:       libgtk-2_0-0 = %{version}
-Supplements:    packageand(%{name}:branding-upstream)
 Provides:       %{name}-branding = %{version}
-BuildArch:      noarch
 Conflicts:      otherproviders(%{name}-branding)
+Supplements:    packageand(%{name}:branding-upstream)
+BuildArch:      noarch
 #BRAND: Provides /etc/gtk-2.0/gtkrc, to define default theme and icon theme.
 #BRAND: Do not forget to add proper Requires in branding package if changing
 #BRAND: those.
@@ -292,7 +292,7 @@ Provides:       gtk2-doc = %{version}
 Obsoletes:      gtk2-doc < %{version}
 # bug437293
 %ifarch ppc64
-Obsoletes:      pkgconfig(gtk+-2.0)-64bit
+Obsoletes:      gtk2-devel-64bit
 %endif
 #