From c58bc3e9af15bbb97ad7b1a79ce5ff0d5708ae179afddd58f413adfbd1c30886 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Dec 2016 18:06:51 +0000 Subject: [PATCH] Accepting request 445166 from GNOME:Next Update to 3.22.5 OBS-URL: https://build.opensuse.org/request/show/445166 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=260 --- gtk+-3.22.4.tar.xz | 3 --- gtk+-3.22.5.tar.xz | 3 +++ gtk3.changes | 23 +++++++++++++++++++++++ gtk3.spec | 37 +++++++++++++++++++++++++++++++------ 4 files changed, 57 insertions(+), 9 deletions(-) delete mode 100644 gtk+-3.22.4.tar.xz create mode 100644 gtk+-3.22.5.tar.xz diff --git a/gtk+-3.22.4.tar.xz b/gtk+-3.22.4.tar.xz deleted file mode 100644 index 63c93e6..0000000 --- a/gtk+-3.22.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f -size 18243596 diff --git a/gtk+-3.22.5.tar.xz b/gtk+-3.22.5.tar.xz new file mode 100644 index 0000000..eb0e0ca --- /dev/null +++ b/gtk+-3.22.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334 +size 18250876 diff --git a/gtk3.changes b/gtk3.changes index 9a30ddd..3351dc2 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Dec 9 17:44:10 UTC 2016 - dimstar@opensuse.org + +- Update to version 3.22.5: + + gtk3-demo now has an example for using PangoTabArray to create + a multi-column layout. + + Bugs fixed: bgo#771242, bgo#774114, bgo#774265, bgo#774379, + bgo#774686, bgo#774695, bgo#774699, bgo#774743, bgo#774760, + bgo#774790, bgo#774893, bgo#774915, bgo#774917, bgo#774939, + bgo#775212, bgo#775316, bgo#775319, bgo#775525. + + Updated translations. + +------------------------------------------------------------------- +Fri Dec 9 16:29:19 UTC 2016 - dimstar@opensuse.org + +- Split out glib schemas into gtk3-schema: gtk3 and gtk4 share the + same schema (in order to sync their config changes). With this + split we can have gtk4-schema provide/obsolete gtk3-schema and + get around the two conflicting on file level. +- Move relevant %gsettings macros from -data to -schema package. +- Require gtk3-schema by libgtk-3-0. +- Split out gettext-its-gtk3. + ------------------------------------------------------------------- Sat Nov 19 11:48:11 UTC 2016 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 2cbe906..fd35375 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.22.4 +Version: 3.22.5 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -97,6 +97,7 @@ Summary: The GTK+ toolkit library (version 3) Group: System/Libraries Requires(post): %{name}-tools Requires: %{name}-data >= %{version} +Requires: %{name}-schema >= %{version} # 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 @@ -275,13 +276,23 @@ ranging from small one-off projects to complete application suites. Summary: The GTK+ toolkit library (version 3) -- Data Files Group: System/Libraries BuildArch: noarch -%glib2_gsettings_schema_requires %description data GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. +%package schema +Summary: The GTK+ toolkit library (version 3) -- Config schema +Group: System/Libraries +BuildArch: noarch +%glib2_gsettings_schema_requires + +%description schema +GTK+ is a multi-platform toolkit for creating graphical user interfaces. +Offering a complete set of widgets, GTK+ is suitable for projects +ranging from small one-off projects to complete application suites. + %package branding-upstream Summary: The GTK+ toolkit library (version 3) -- Upstream theme configuration Group: System/Libraries @@ -306,6 +317,7 @@ icon themes. %package devel Summary: The GTK+ toolkit library (version 3) -- Development Files Group: Development/Libraries/X11 +Requires: gettext-its-%{name} >= %{version} Requires: libgtk-3-0 = %{version} Requires: typelib-1_0-Gtk-3_0 = %{version} %glib2_gsettings_schema_requires @@ -317,6 +329,13 @@ ranging from small one-off projects to complete application suites. This package contains the development files for GTK+ 3.x. +%package -n gettext-its-%{name} +Summary: International Tag Set for GTK+ 3 +Group: Development/Libraries/X11 + +%description -n gettext-its-%{name} +This package enhances gettext with an International Tag Set for GTK+ 3 + %lang_package %prep %setup -q -n %{_name}-%{version} @@ -457,7 +476,7 @@ fi update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 3 \ --slave %{_mandir}/man1/gtk-update-icon-cache.1.gz gtk-update-icon-cache.1.gz %{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz -%post data +%post schema %glib2_gsettings_schema_post %post devel @@ -496,7 +515,7 @@ update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-c %postun immodule-xim %{_gtk_query_immodules_update_cache} -%postun data +%postun schema %glib2_gsettings_schema_postun %postun tools @@ -601,11 +620,15 @@ fi %{_mandir}/man1/gtk-update-icon-cache.1%{?ext_man} %ghost %{_sysconfdir}/alternatives/gtk-update-icon-cache.1%{?ext_man} -%files data +%files schema %defattr(-,root,root) %{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml %{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml + +%files data +%defattr(-,root,root) %{_datadir}/themes/Default/ %{_datadir}/themes/Emacs/ @@ -631,7 +654,6 @@ fi %{_datadir}/applications/gtk3-demo.desktop %{_datadir}/applications/gtk3-widget-factory.desktop %{_datadir}/gir-1.0/*.gir -%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml %dir %{_datadir}/gtk-3.0 %{_datadir}/gtk-3.0/gtkbuilder.rng %{_datadir}/icons/hicolor/*/apps/gtk3-demo.png @@ -662,6 +684,9 @@ fi %{_libdir}/libgdk-3.so %{_libdir}/libgtk-3.so %{_sysconfdir}/rpm/macros.gtk3 + +%files -n gettext-its-%{name} +%defattr(-,root,root) %dir %{_datadir}/gettext/ %dir %{_datadir}/gettext/its/ %{_datadir}/gettext/its/gtkbuilder.its