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

ok

OBS-URL: https://build.opensuse.org/request/show/61092
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=31

baselibs.conf

@@ -8,6 +8,8 @@ gtk3-tools
 libgtk-3-0
   requires "gtk3-tools-<targettype>"
   provides "gtk3-<targettype> = <version>"
+  provides "libgtk-3_0-0-<targettype> = <version>"
+  obsoletes "libgtk-3_0-0-<targettype> < <version>"
   post "%if "%_lib" == "lib64""
   post "if test -f <prefix>%{_bindir}/gtk-query-immodules-3.0-64; then <prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache; fi"
   post "%else"

gtk3.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 13 22:10:29 CET 2011 - vuntz@opensuse.org
+
+- Add Provides/Obsoletes for libgtk-3_0-0 to libgtk-3-0 since there
+  are some files that are shared between the two and some users
+  might have libgtk-3_0-0 already.
+- Remove default gtkrc that was used in branding-upstream, and
+  replace it with a settings.ini file, since this is the new
+  mechanism.
+
 -------------------------------------------------------------------
 Fri Feb 11 06:27:00 UTC 2011 - fcrozat@novell.com
 
@@ -8,9 +18,10 @@ Fri Feb 11 06:27:00 UTC 2011 - fcrozat@novell.com
     bgo#641196, bgo#641302, bgo#641367, bgo#641409, bgo#641429,
     bgo#641431, bgo#641517, bgo#641558, bgo#641621, bgo#641640.
   + Updated translations.
-- pixmap theme engine is not available, not yet ported to
-  GtkThemingEngine.
 - Rename library package accordingly with new library soname.
+- Remove update-alternatives mechanism for gtk-builder-convert
+  since the tool is not in gtk3 anymore. Also remove python-xml
+  Requires of devel package, which was there only for this tool.
 
 -------------------------------------------------------------------
 Thu Feb  3 16:06:36 CET 2011 - dimstar@opensuse.org
@@ -22,7 +33,7 @@ Thu Feb  3 16:06:36 CET 2011 - dimstar@opensuse.org
   + We no longer build the gtk-update-icon-cache utility, and
     use a preexisting one, if --enable-gtk2-dependency is passed
     to configure
-  + GtkBuilder can now fill GtkComboBoxText and GtkMenToolButton
+  + GtkBuilder can now fill GtkComboBoxText and GtkMenuToolButton
     widgets with data, as well as GtkFileFilters and
     GtkTextTagTables
   + GtkImage now has a ::use-fallback property to allow generic

gtk3.spec

@@ -30,7 +30,7 @@ Url:            http://www.gtk.org/
 Group:          System/Libraries
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.90/%{_name}-%{version}.tar.bz2
 Source1:        README.SUSE
-Source2:        gtkrc
+Source2:        settings.ini
 Source3:        macros.gtk3
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
@@ -90,6 +90,10 @@ Recommends:     %{name}-lang
 Recommends:     gvfs
 # Provide %{name} to make the lang and immodules packages installable
 Provides:       %{name} = %{version}
+# Before 3.0, the package was actually libgtk-3_0-0 and files might
+# conflict
+Provides:       libgtk-3_0-0 = %{version}
+Obsoletes:      libgtk-3_0-0 < %{version}
 
 %description -n libgtk-3-0
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -292,7 +296,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete -print
 %endif
 %find_lang gtk30
 %find_lang gtk30-properties
-install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/gtkrc
+install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
 touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
 %if "%_lib" == "lib64"
   mv %{buildroot}%{_bindir}/gtk-query-immodules-3.0 %{buildroot}%{_bindir}/gtk-query-immodules-3.0-64
@@ -301,8 +305,6 @@ touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
 # create theming-engines directory that should have been created during the build
 test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
 mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
-test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/engines
-mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/engines
 # Alternatives for gtk-update-icon-cache and gtk-builder-convert
 mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0
 mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1
@@ -434,10 +436,7 @@ fi
 %dir %{_sysconfdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}
-%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/engines/
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/
-# the pixbuf engine needs to be ported to GtkThemingEngine
-# %{_libdir}/gtk-3.0/%{gtk_binary_version}/engines/libpixmap.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cedilla.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cyrillic-translit.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-ipa.so
@@ -505,7 +504,7 @@ fi
 
 %files branding-upstream
 %defattr(-,root,root)
-%config %{_sysconfdir}/gtk-3.0/gtkrc
+%config %{_sysconfdir}/gtk-3.0/settings.ini
 
 %files lang -f gtk30.lang -f gtk30-properties.lang
 

gtkrc

@@ -1,11 +0,0 @@
-#
-# gtkrc file allows you to define system wide defaults for all GTK+ applications.
-# This file is branding specific.
-#
-# For complete list of available settings see the Resource Files chapter in the
-# GTK+ documentation.
-#
-# You most probably want:
-#gtk-theme-name = ""
-#gtk-icon-theme-name = ""
-#gtk-fallback-icon-theme = "gnome"

settings.ini

@@ -0,0 +1,13 @@
+#
+# settings.ini file allows you to define system wide defaults for
+# all GTK+ applications. This file is branding specific.
+#
+# For complete list of available settings see the Settings chapter
+# in the GTK+ documentation.
+#
+# You most probably want to change the following settings.
+
+[Settings]
+#gtk-theme-name = 
+#gtk-icon-theme-name = 
+#gtk-fallback-icon-theme = gnome