Accepting request 445167 from GNOME:Next
- Split out glib schemas into gtk4-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 gtk4-schema by libgtk-4-0. - Provide/Obsolete gtk3-schema by gtk4-schema. - Split out gettext-its-gtk4. OBS-URL: https://build.opensuse.org/request/show/445167 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=4
This commit is contained in:
Git OBS Bridge
parent
08e884baa4
commit
cba3846c97
12
gtk4.changes
12
gtk4.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 16:29:19 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Split out glib schemas into gtk4-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 gtk4-schema by libgtk-4-0.
|
||||
- Provide/Obsolete gtk3-schema by gtk4-schema.
|
||||
- Split out gettext-its-gtk4.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 12:38:11 UTC 2016 - jengelh@inai.de
|
||||
|
||||
|
||||
42
gtk4.spec
42
gtk4.spec
@ -94,6 +94,7 @@ Summary: The GTK+ toolkit library (version 4)
|
||||
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
|
||||
@ -266,13 +267,26 @@ ranging from small one-off projects to complete application suites.
|
||||
Summary: Data files for the GTK+ toolkit library v4
|
||||
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
|
||||
# The schema is shared between gtk3 and gtk4 - gtk4 wins
|
||||
Provides: gtk3-schema = %{version}
|
||||
Obsoletes: gtk3-schema < %{version}
|
||||
%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: Upstream theme configuration for the GTK+ toolkit library v4
|
||||
Group: System/Libraries
|
||||
@ -299,6 +313,7 @@ Summary: Development files for the GTK+ toolkit library v4
|
||||
Group: Development/Libraries/X11
|
||||
Requires: libgtk-4-0 = %{version}
|
||||
Requires: typelib-1_0-Gtk-4_0 = %{version}
|
||||
Requires: gettext-its-%{name} >= %{version}
|
||||
%glib2_gsettings_schema_requires
|
||||
|
||||
%description devel
|
||||
@ -308,6 +323,17 @@ ranging from small one-off projects to complete application suites.
|
||||
|
||||
This package contains the development files for GTK+ 4.x.
|
||||
|
||||
%package -n gettext-its-%{name}
|
||||
Summary: International Tag Set for GTK+ 4
|
||||
Group: Development/Libraries/X11
|
||||
# The ITS is compatible between GTK3 and GTK4
|
||||
Provides: gettext-its-gtk3 = %{version}
|
||||
Obsoletes: gettext-its-gtk3 < %{version}
|
||||
|
||||
%description -n gettext-its-%{name}
|
||||
This package enhances gettext with an International Tag Set for GTK+ 4
|
||||
|
||||
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
@ -407,7 +433,7 @@ if [ $1 = 1 ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
%post data
|
||||
%post schema
|
||||
%glib2_gsettings_schema_post
|
||||
|
||||
%post devel
|
||||
@ -446,7 +472,7 @@ fi
|
||||
%postun immodule-xim
|
||||
%{_gtk_query_immodules_update_cache}
|
||||
|
||||
%postun data
|
||||
%postun schema
|
||||
%glib2_gsettings_schema_postun
|
||||
|
||||
%postun devel
|
||||
@ -535,11 +561,15 @@ fi
|
||||
%{_mandir}/man1/gtk4-query-settings.1%{?ext_man}
|
||||
%{_mandir}/man1/gtk4-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/
|
||||
|
||||
@ -564,7 +594,6 @@ fi
|
||||
%{_datadir}/applications/gtk4-demo.desktop
|
||||
%{_datadir}/applications/gtk4-widget-factory.desktop
|
||||
%{_datadir}/gir-1.0/*.gir
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
|
||||
%dir %{_datadir}/gtk-4.0
|
||||
%{_datadir}/gtk-4.0/gtkbuilder.rng
|
||||
%{_datadir}/icons/hicolor/*/apps/gtk4-demo.png
|
||||
@ -582,6 +611,9 @@ fi
|
||||
%{_libdir}/pkgconfig/gtk+-x11-4.0.pc
|
||||
%{_libdir}/libgtk-4.so
|
||||
%{_sysconfdir}/rpm/macros.gtk4
|
||||
|
||||
%files -n gettext-its-%{name}
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/gettext/
|
||||
%dir %{_datadir}/gettext/its/
|
||||
%{_datadir}/gettext/its/gtkbuilder.its
|
||||
|
||||
Loading…
Reference in New Issue
Block a user