From 17cae1a0dffb9eb46bf32034e6569a7590e7114c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:16:48 +0000 Subject: import gnome-desktop3-3.28.2-2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d01560a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/gnome-desktop-3.28.2.tar.xz diff --git a/.gnome-desktop3.metadata b/.gnome-desktop3.metadata new file mode 100644 index 0000000..598c848 --- /dev/null +++ b/.gnome-desktop3.metadata @@ -0,0 +1 @@ +3ea90d5fd86e51a02fd55b966bc6f20eee5c6799 SOURCES/gnome-desktop-3.28.2.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet 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/SPECS/gnome-desktop3.spec b/SPECS/gnome-desktop3.spec new file mode 100644 index 0000000..51550ac --- /dev/null +++ b/SPECS/gnome-desktop3.spec @@ -0,0 +1,410 @@ +%global gdk_pixbuf2_version 2.36.5 +%global gtk3_version 3.3.6 +%global glib2_version 2.53.0 +%global gtk_doc_version 1.14 +%global gsettings_desktop_schemas_version 3.27.0 +%global po_package gnome-desktop-3.0 + +Name: gnome-desktop3 +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.28/gnome-desktop-%{version}.tar.xz + +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: 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 + +%if 0%{?fedora} +# From rhughes-f20-gnome-3-12 copr +Obsoletes: compat-gnome-desktop310 < 3.12 +%endif + +%description + +The %{name} package contains an internal library +(libgnomedesktop) used to implement some portions of the GNOME +desktop, and also some data files and other shared components of the +GNOME user environment. + +%package devel +Summary: Libraries and headers for %{name} +License: LGPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Libraries and header files for the GNOME-internal private library +libgnomedesktop. + +%package tests +Summary: Tests for the %{name} package +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. + +%prep +%autosetup -p1 -n gnome-desktop-%{version} + +%build +%configure --enable-installed-tests +make %{?_smp_mflags} + +%install +%make_install + +# 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 + +%postun -p /sbin/ldconfig + +%files -f %{po_package}.lang +%doc AUTHORS NEWS README +%license COPYING COPYING.LIB +%{_datadir}/gnome/gnome-version.xml +%{_libexecdir}/gnome-rr-debug +# LGPL +%{_libdir}/libgnome-desktop-3.so.12* +%{_libdir}/libgnome-desktop-3.so.17* +%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib + +%files devel +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%{_includedir}/* +%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir +%dir %{_datadir}/gtk-doc/ +%dir %{_datadir}/gtk-doc/html/ +%doc %{_datadir}/gtk-doc/html/gnome-desktop3/ + +%files tests +%{_libexecdir}/installed-tests/gnome-desktop +%{_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 + +* Tue Nov 15 2016 Kalev Lember - 3.22.2-1 +- Update to 3.22.2 +- Resolves: #1386887 + +* Wed Nov 12 2014 Kalev Lember - 3.14.2-1 +- Update to 3.14.2 +- Resolves: #1174444 + +* Fri Jan 31 2014 Ray Strode 3.8.4-4 +- Don't use glibc internal locale archive. + Resolves: #1045405 + +* Fri Jan 24 2014 Daniel Mach - 3.8.4-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.8.4-2 +- Mass rebuild 2013-12-27 + +* Wed Sep 4 2013 Rui Matos - 3.8.4-1 +- Update to 3.8.4 + +* Fri Jun 7 2013 Rui Matos - 3.8.3-1 +- Update to 3.8.3 + +* Tue May 14 2013 Rui Matos - 3.8.2-2 +- Add patch to default to ibus-kkc for Japanese + +* Mon May 13 2013 Matthias Clasen - 3.8.2-1 +- Update to 3.8.2 + +* Mon Apr 15 2013 Kalev Lember - 3.8.1-1 +- Update to 3.8.1 + +* Wed Mar 27 2013 Kalev Lember - 3.8.0.1-1 +- Update to 3.8.0.1 + +* Tue Mar 26 2013 Kalev Lember - 3.8.0-1 +- Update to 3.8.0 + +* Tue Mar 19 2013 Matthias Clasen - 3.7.92-1 +- Update to 3.7.92 + +* Wed Mar 6 2013 Matthias Clasen - 3.7.91.1-1 +- Update to 3.7.91.1 + +* Thu Feb 21 2013 Kalev Lember - 3.7.90-2 +- Conflict with older gnome-shell versions + +* Wed Feb 20 2013 Richard Hughes - 3.7.90-1 +- Update to 3.7.90 + +* Tue Feb 05 2013 Richard Hughes - 3.7.5-1 +- Update to 3.7.5 + +* Tue Jan 15 2013 Matthias Clasen - 3.7.4-1 +- Update to 3.7.4 + +* Thu Dec 20 2012 Kalev Lember - 3.7.3-1 +- Update to 3.7.3 + +* Tue Nov 20 2012 Richard Hughes - 3.7.2-1 +- Update to 3.7.2 + +* Fri Nov 09 2012 Kalev Lember - 3.7.1-1 +- Update to 3.7.1 + +* Wed Oct 17 2012 Kalev Lember - 3.6.1-1 +- Update to 3.6.1 + +* Wed Sep 26 2012 Richard Hughes - 3.6.0.1-1 +- Update to 3.6.0.1 + +* Tue Sep 25 2012 Richard Hughes - 3.6.0-1 +- Update to 3.6.0 + +* Thu Sep 06 2012 Richard Hughes - 3.5.91-1 +- Update to 3.5.91 + +* Wed Aug 22 2012 Richard Hughes - 3.5.90-1 +- Update to 3.5.90 + +* Tue Aug 07 2012 Richard Hughes - 3.5.5-1 +- Update to 3.5.5 + +* Fri Jul 27 2012 Fedora Release Engineering - 3.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 17 2012 Richard Hughes - 3.5.4-1 +- Update to 3.5.4 + +* Tue Jun 26 2012 Richard Hughes - 3.5.3-1 +- Update to 3.5.3 + +* Thu Jun 07 2012 Richard Hughes - 3.5.2-3 +- Add missing files + +* Thu Jun 07 2012 Richard Hughes - 3.5.2-2 +- Add missing BRs + +* Wed Jun 06 2012 Richard Hughes - 3.5.2-1 +- Update to 3.5.2 + +* Mon May 14 2012 Richard Hughes - 3.4.2-1 +- Update to 3.4.2 + +* Mon Apr 16 2012 Daniel Drake - 3.4.1-2 +- Add upstream patch to fix crash when the system clock is wrong +- Fixes GNOME#673551, OLPC#11714 + +* Mon Apr 16 2012 Richard Hughes - 3.4.1-1 +- Update to 3.4.1 + +* Mon Mar 26 2012 Richard Hughes - 3.4.0-1 +- New upstream version. + +* Mon Mar 19 2012 Richard Hughes 3.3.92-1 +- Update to 3.3.92 + +* Tue Feb 6 2012 Matthias Clasen - 3.3.5-1 +- Update to 3.3.5 + +* Tue Jan 17 2012 Matthias Clasen - 3.3.4-1 +- Update to 3.3.4 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 20 2011 Matthias Clasen - 3.3.3-1 +- Update to 3.3.3 + +* Mon Nov 21 2011 Matthias Clasen - 3.3.2-1 +- Update to 3.3.2 + +* Wed Nov 2 2011 Matthias Clasen - 3.3.1-1 +- Update to 3.3.1 + +* Wed Oct 26 2011 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for glibc bug#747377 + +* Tue Oct 18 2011 Matthias Clasen - 3.2.1-1 +- Update to 3.2.1 + +* Tue Sep 27 2011 Ray - 3.2.0-1 +- Update to 3.2.0 + +* Tue Sep 27 2011 Ray - 3.2.0-1 +- Update to 3.2.0 + +* Mon Sep 19 2011 Matthias Clasen - 3.1.92-1 +- Update to 3.1.92 + +* Mon Sep 12 2011 Matthias Clasen - 3.1.91-3 +- Fix a gnome-screensaver crash + +* Fri Sep 9 2011 Matthias Clasen - 3.1.91-2 +- Require gsettings-desktop-schemas + +* Tue Sep 5 2011 Matthias Clasen - 3.1.91-1 +- Update to 3.1.91 + +* Tue Aug 30 2011 Matthias Clasen - 3.1.90.1-1 +- Update to 3.1.90.1 + +* Tue Aug 16 2011 Matthias Clasen - 3.1.5-1 +- Update to 3.1.5 + +* Mon Jul 25 2011 Matthias Clasen - 3.1.4-1 +- Update to 3.1.4 + +* Mon Jul 04 2011 Bastien Nocera 3.1.3-1 +- Update to 3.1.3 + +* Tue Jun 14 2011 Tomas Bzatek - 3.1.2-1 +- Update to 3.1.2 + +* Wed May 11 2011 Tomas Bzatek - 3.1.1-1 +- Update to 3.1.1 + +* Mon May 2 2011 Matthias Clasen - 3.0.1-2 +- Prevent segfaults in gnome-rr users on randr-less displays + +* Tue Apr 26 2011 Matthias Clasen - 3.0.1-1 +- Update to 3.0.1 + +* Fri Apr 15 2011 Matthias Clasen - 3.0.0-2 +- Require gnome-themes-standard (#674799) + +* Mon Apr 4 2011 Christopher Aillon - 3.0.0-1 +- Update to 3.0.0 + +* Thu Mar 24 2011 Christopher Aillon - 2.91.93-1 +- Update to 2.91.93 + +* Tue Mar 22 2011 Matthias Clasen - 2.91.92-1 +- Update to 2.91.92 + +* Mon Mar 7 2011 Matthias Clasen - 2.91.91-1 +- Update to 2.91.91 + +* Mon Feb 21 2011 Matthias Clasen - 2.91.90-1 +- 2.91.90 +- Drop obsolete GConf dep + +* Thu Feb 10 2011 Matthias Clasen - 2.91.6.1-4 +- Rebuild against newer gtk + +* Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Feb 04 2011 Bastien Nocera 2.91.6.1-2 +- Fix refcount issue in GnomeRRLabeler + +* Wed Feb 2 2011 Matthias Clasen 2.91.6.1-1 +- Update to 2.91.6.1 + +* Wed Feb 2 2011 Matthias Clasen 2.91.6-3 +- Rebuild against newer gtk + +* Fri Jan 28 2011 Matthias Clasen 2.91.6-2 +- Build with introspection support + +* Tue Jan 11 2011 Matthias Clasen 2.91.6-1 +- Update to 2.91.6 + +* Mon Jan 10 2011 Matthias Clasen 2.91.5-1 +- Update to 2.91.5 + +* Fri Jan 7 2011 Matthias Clasen 2.91.4-1 +- Update to 2.91.4 + +* Fri Dec 3 2010 Matthias Clasen 2.91.3-2 +- Rebuild against new gtk + +* Thu Nov 25 2010 Bastien Nocera 2.91.3-1 +- Update to 2.91.3 + +* Wed Nov 17 2010 Bastien Nocera 2.91.2-1 +- Update to 2.91.2 + +* Thu Nov 11 2010 Bill Nottingham 2.91.1-3 +- remove some extraneous deps + +* Thu Nov 11 2010 Bastien Nocera 2.91.1-2 +- Fix a possible double-free crasher + +* Wed Nov 10 2010 Bastien Nocera 2.91.1-1 +- Update to 2.91.1 + +* Tue Nov 2 2010 Matthias Clasen 2.91.0-3 +- Rebuild against newer gtk3 + +* Thu Oct 28 2010 Bill Nottingham 2.91.0-2 +- flip background to match F-14 + +* Mon Oct 4 2010 Matthias Clasen 2.91.0-1 +- Update to 2.91.0 + +* Wed Sep 29 2010 jkeating - 2.90.4-4 +- Rebuilt for gcc bug 634757 + +* Wed Sep 22 2010 Matthias Clasen 2.90.4-3 +- Rebuild against newer gobject-introspection +- Rebuild against newer gtk + +* Thu Aug 19 2010 Matthias Clasen 2.90.4-2 +- Prevent file conflict with gnome-desktop + +* Tue Jun 29 2010 Matthias Clasen 2.90.4-1 +- Update to 2.90.4 + +* Mon Jun 28 2010 Matthias Clasen 2.90.2-1 +- 2.90.2 + +* Thu Jun 17 2010 Richard Hughes 2.90.1-1 +- Initial build for review. +