Accepting request 538179 from home:pluskalm:branches:GNOME:Factory

- Explicitly require python2 modules for devel package
- Cleanup with spec-cleaner

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

gtk2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  1 14:13:22 UTC 2017 - mpluskal@suse.com
+
+- Explicitly require python2 modules for devel package
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Tue Jun 27 12:26:52 UTC 2017 - dimstar@opensuse.org
 

gtk2.spec

@@ -18,9 +18,8 @@
 
 # When updating the binary version, do not forget to also update baselibs.conf
 %define gtk_binary_version 2.10.0
-
-Name:           gtk2
 %define _name gtk+
+Name:           gtk2
 Version:        2.24.31
 Release:        0
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
@@ -72,6 +71,7 @@ BuildRequires:  gobject-introspection-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  pango-devel
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(x11)
@@ -84,7 +84,6 @@ BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xrandr) >= 1.2.99
 BuildRequires:  pkgconfig(xrender)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -94,12 +93,12 @@ 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 >= 2.24.20
 # 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
 # bring it in.
 Requires:       hicolor-icon-theme
+Requires(post): %{name}-tools >= 2.24.20
 # gtk+ can work without branding/data/translations. Built in defaults will be used then.
 Recommends:     %{name}-branding
 Recommends:     %{name}-data = %{version}
@@ -117,10 +116,6 @@ Obsoletes:      %{name} < %{version}
 # gail is part of gtk+ as of 2.13.x
 Provides:       gail = 1.22.1
 Obsoletes:      gail < 1.22.1
-# bug437293
-%ifarch ppc64
-Obsoletes:      gtk2-64bit
-%endif
 #
 
 %description -n libgtk-2_0-0
@@ -273,9 +268,9 @@ 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}
-Provides:       %{name}-branding = %{version}
-Conflicts:      otherproviders(%{name}-branding)
 Supplements:    packageand(%{name}:branding-upstream)
+Conflicts:      otherproviders(%{name}-branding)
+Provides:       %{name}-branding = %{version}
 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
@@ -291,17 +286,13 @@ Summary:        The GTK+ toolkit library (version 2) -- Development Files
 Group:          Development/Libraries/X11
 Requires:       libgtk-2_0-0 = %{version}
 # gtk-builder-convert needs this.
-Requires:       python-xml
+Requires:       python2-xml
 Requires:       typelib-1_0-Gtk-2_0 = %{version}
 # gail is part of gtk+ as of 2.13.x
 Provides:       gail-devel = 1.22.1
 Obsoletes:      gail-devel < 1.22.1
 Provides:       gtk2-doc = %{version}
 Obsoletes:      gtk2-doc < %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      gtk2-devel-64bit
-%endif
 #
 
 %description devel
@@ -312,6 +303,7 @@ ranging from small one-off projects to complete application suites.
 This package contains the development files for GTK+ 2.x.
 
 %lang_package
+
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
@@ -359,7 +351,7 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-find %{buildroot}%{_libdir} -name '*.la' -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 %if 0%{?suse_version} <= 1130
 rm %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*
 %endif
@@ -471,7 +463,6 @@ fi
 %endif
 
 %postun -n libgtk-2_0-0 -p /sbin/ldconfig
-
 %postun immodule-amharic
 %{_gtk_query_immodules_update_cache}
 
@@ -502,7 +493,6 @@ if [ ! -f %{_bindir}/gtk-update-icon-cache-2.0 ]; then
 fi
 
 %files -n libgtk-2_0-0
-%defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS
 %if "%{_lib}" == "lib64"
 %doc README.SUSE
@@ -528,43 +518,34 @@ fi
 %{_libdir}/libgtk-x11-2.0.so.*
 
 %files -n typelib-1_0-Gtk-2_0
-%defattr(-,root,root)
 %{_libdir}/girepository-1.0/Gdk-2.0.typelib
 %{_libdir}/girepository-1.0/GdkX11-2.0.typelib
 %{_libdir}/girepository-1.0/Gtk-2.0.typelib
 
 %files immodule-amharic
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-am-et.so
 
 %files immodule-inuktitut
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-inuktitut.so
 
 %files immodule-multipress
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-multipress.so
 %config %{_sysconfdir}/gtk-2.0/im-multipress.conf
 
 %files immodule-thai
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-thai.so
 
 %files immodules-tigrigna
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-er.so
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-et.so
 
 %files immodule-vietnamese
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-viqr.so
 
 %files immodule-xim
-%defattr(-,root,root)
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-xim.so
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/gtk-query-immodules-2.0*
 %{_bindir}/gtk-update-icon-cache-2.0
 %{_bindir}/gtk-update-icon-cache
@@ -575,19 +556,16 @@ fi
 %{_mandir}/man1/gtk-update-icon-cache.1%{?ext_man}
 
 %files data
-%defattr(-,root,root)
 %{_datadir}/themes/Default/
 %{_datadir}/themes/Emacs/
 %{_datadir}/themes/Raleigh/
 
 %files branding-upstream
-%defattr(-,root,root)
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %files lang -f gtk20.lang -f gtk20-properties.lang
 
 %files devel
-%defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/gail-libgail-util/
 %doc %{_datadir}/gtk-doc/html/gdk2/
 %doc %{_datadir}/gtk-doc/html/gtk2/