diff --git a/.gitignore b/.gitignore index 76cdcb3..d01560a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-desktop-3.22.2.tar.xz +SOURCES/gnome-desktop-3.28.2.tar.xz diff --git a/.gnome-desktop3.metadata b/.gnome-desktop3.metadata index be4e2c9..598c848 100644 --- a/.gnome-desktop3.metadata +++ b/.gnome-desktop3.metadata @@ -1 +1 @@ -6f85c986d2074f8aca75fd7f6ab0fd21e74b65c4 SOURCES/gnome-desktop-3.22.2.tar.xz +3ea90d5fd86e51a02fd55b966bc6f20eee5c6799 SOURCES/gnome-desktop-3.28.2.tar.xz diff --git a/SOURCES/0001-Use-flatpak-s-bwrap.patch b/SOURCES/0001-Use-flatpak-s-bwrap.patch new file mode 100644 index 0000000..57f65ff --- /dev/null +++ b/SOURCES/0001-Use-flatpak-s-bwrap.patch @@ -0,0 +1,26 @@ +From 48f8ce7cc8550511d1fa32b71a67026fc94f0b70 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 4 Jun 2018 17:00:12 +0200 +Subject: [PATCH] Use flatpak's bwrap + +As the stand-alone version isn't available in RHEL 7 +--- + libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index 14e2fed3..c8027db0 100644 +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -514,7 +514,7 @@ add_bwrap (GPtrArray *array, + g_return_val_if_fail (script->s_infile != NULL, FALSE); + + add_args (array, +- "bwrap", ++ "/usr/libexec/flatpak-bwrap", + "--ro-bind", "/usr", "/usr", + "--ro-bind", "/lib", "/lib", + "--ro-bind", "/lib64", "/lib64", +-- +2.17.0 + diff --git a/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch b/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch deleted file mode 100644 index 2c19906..0000000 --- a/SOURCES/0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a42a5d0806b8a70112d0daabd26bd20b281eb472 Mon Sep 17 00:00:00 2001 -From: Peng Wu -Date: Mon, 19 Dec 2016 17:09:19 +0800 -Subject: [PATCH] default-input-sources: Change default for zh_TW to - ibus-libzhuyin - -https://bugzilla.redhat.com/show_bug.cgi?id=1405946 - -https://bugzilla.gnome.org/show_bug.cgi?id=772674 ---- - libgnome-desktop/default-input-sources.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome-desktop/default-input-sources.h b/libgnome-desktop/default-input-sources.h -index b743657..bbb83e3 100644 ---- a/libgnome-desktop/default-input-sources.h -+++ b/libgnome-desktop/default-input-sources.h -@@ -53,6 +53,6 @@ static DefaultInputSource default_input_sources[] = - { "ur_IN", "ibus", "m17n:ur:phonetic" }, - { "zh_CN", "ibus", "libpinyin" }, - { "zh_HK", "ibus", "cangjie" }, -- { "zh_TW", "ibus", "chewing" }, -+ { "zh_TW", "ibus", "libzhuyin" }, - { NULL, NULL, NULL } - }; --- -2.9.3 - diff --git a/SOURCES/0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch b/SOURCES/0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch deleted file mode 100644 index c6bfcf8..0000000 --- a/SOURCES/0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5d478332677df7e428f82d4de0fe9ae4368d9554 Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Tue, 14 May 2013 13:24:09 +0200 -Subject: [PATCH] default-input-sources: Switch ja_JP default to ibus-kkc - -This should be the default ibus engine for Japanese in F19. ---- - libgnome-desktop/default-input-sources.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome-desktop/default-input-sources.h b/libgnome-desktop/default-input-sources.h -index c38e339..bb0b8b8 100644 ---- a/libgnome-desktop/default-input-sources.h -+++ b/libgnome-desktop/default-input-sources.h -@@ -30,7 +30,7 @@ static DefaultInputSource default_input_sources[] = - { "he_IL", "xkb", "il" }, - { "hi_IN", "ibus", "m17n:hi:inscript" }, - { "it_IT", "xkb", "it" }, -- { "ja_JP", "ibus", "anthy" }, -+ { "ja_JP", "ibus", "kkc" }, - { "kn_IN", "ibus", "m17n:kn:kgp" }, - { "ko_KR", "ibus", "hangul" }, - { "mai_IN", "ibus", "m17n:mai:inscript" }, --- -1.8.1.4 - diff --git a/SOURCES/0001-wallclock-Prevent-a-crash.patch b/SOURCES/0001-wallclock-Prevent-a-crash.patch deleted file mode 100644 index 98849c2..0000000 --- a/SOURCES/0001-wallclock-Prevent-a-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c0df0733ccd71b32eae65ba04364f512b07f9c43 Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Wed, 19 Apr 2017 19:16:29 +0200 -Subject: [PATCH] wallclock: Prevent a crash - -https://bugzilla.gnome.org/show_bug.cgi?id=780861 ---- - libgnome-desktop/gnome-wall-clock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c -index 1cd67a8..2b6b7c5 100644 ---- a/libgnome-desktop/gnome-wall-clock.c -+++ b/libgnome-desktop/gnome-wall-clock.c -@@ -85,7 +85,7 @@ gnome_wall_clock_init (GnomeWallClock *self) - g_signal_connect (self->priv->tz_monitor, "changed", G_CALLBACK (on_tz_changed), self); - - self->priv->desktop_settings = g_settings_new ("org.gnome.desktop.interface"); -- g_signal_connect (self->priv->desktop_settings, "changed", G_CALLBACK (on_schema_change), self); -+ g_signal_connect_object (self->priv->desktop_settings, "changed", G_CALLBACK (on_schema_change), self, 0); - - ampm = nl_langinfo (AM_STR); - if (ampm != NULL && *ampm != '\0') --- -2.9.3 - diff --git a/SPECS/gnome-desktop3.spec b/SPECS/gnome-desktop3.spec index 89dcb81..51550ac 100644 --- a/SPECS/gnome-desktop3.spec +++ b/SPECS/gnome-desktop3.spec @@ -1,42 +1,46 @@ -%global gdk_pixbuf2_version 2.33.0 +%global gdk_pixbuf2_version 2.36.5 %global gtk3_version 3.3.6 -%global glib2_version 2.44.0 +%global glib2_version 2.53.0 %global gtk_doc_version 1.14 -%global gsettings_desktop_schemas_version 3.5.91 +%global gsettings_desktop_schemas_version 3.27.0 %global po_package gnome-desktop-3.0 Name: gnome-desktop3 -Version: 3.22.2 +Version: 3.28.2 Release: 2%{?dist} Summary: Shared code among gnome-panel, gnome-session, nautilus, etc License: GPLv2+ and LGPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-desktop/3.22/gnome-desktop-%{version}.tar.xz -Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch -Patch1: 0001-default-input-sources-Change-default-for-zh_TW-to-ib.patch -Patch2: 0001-wallclock-Prevent-a-crash.patch +Source0: http://download.gnome.org/sources/gnome-desktop/3.28/gnome-desktop-%{version}.tar.xz -BuildRequires: gnome-common BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: gettext BuildRequires: gtk-doc >= %{gtk_doc_version} -BuildRequires: automake autoconf libtool intltool +BuildRequires: intltool BuildRequires: itstool +BuildRequires: gnome-desktop3 Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version} +Requires: glib2%{?_isa} >= %{glib2_version} # Make sure that gnome-themes-standard gets pulled in for upgrades Requires: gnome-themes-standard # needed for GnomeWallClock Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version} +# Replace standalone bwrap with flatpak's +Requires: flatpak +Patch0: 0001-Use-flatpak-s-bwrap.patch + # GnomeIdleMonitor API change breaks older gnome-shell versions Conflicts: gnome-shell < 3.7.90 @@ -70,10 +74,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%setup -q -n gnome-desktop-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n gnome-desktop-%{version} %build %configure --enable-installed-tests @@ -85,6 +86,9 @@ make %{?_smp_mflags} # stuff we don't want rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# copy over previous soname for temporary ABI compat +cp -a %{_libdir}/libgnome-desktop-3.so.12* $RPM_BUILD_ROOT%{_libdir} + %find_lang %{po_package} --all-name --with-gnome %post -p /sbin/ldconfig @@ -97,7 +101,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gnome/gnome-version.xml %{_libexecdir}/gnome-rr-debug # LGPL -%{_libdir}/lib*.so.* +%{_libdir}/libgnome-desktop-3.so.12* +%{_libdir}/libgnome-desktop-3.so.17* %{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib %files devel @@ -114,6 +119,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/installed-tests %changelog +* Mon Jun 04 2018 Bastien Nocera - 3.28.2-2 ++ gnome-desktop3-3.28.2-2 +- Bump release to build with flatpak's bwrap +- Related: #1567479 + +* Thu May 10 2018 Kalev Lember - 3.28.2-1 +- Update to 3.28.2 +- Resolves: #1567479 + * Wed Apr 19 2017 Rui Matos - 3.22.2-2 - Fix a crash Resolves: #1437059