[mate-session-manager] fix BZ#888184
nmarques
nmarques at fedoraproject.org
Fri Dec 21 21:21:47 UTC 2012
commit 310e11a7e3769260dd0493f151912d468bbc6162
Author: Nelson Marques <nmarques at localhost.localdomain>
Date: Fri Dec 21 16:03:35 2012 -0500
fix BZ#888184
mate-session-manager.spec | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 30597f9..ec5472f 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,10 +1,15 @@
Name: mate-session-manager
Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MATE Desktop session manager
License: GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+Requires: gsettings-desktop-schemas
+
+# PATCH-FIX-UPSTREAM mate-session-manager-1.5.0-fix_schema.patch - taken from upstream
+# Fix a broken schema that makes session manager segfault and break suspend/hibernation
+Patch0: mate-session-manager-1.5.0-fix_schema.patch
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig(gtk+-2.0)
@@ -17,17 +22,19 @@ BuildRequires: mate-icon-theme
BuildRequires: icon-naming-utils
BuildRequires: pkgconfig(polkit-agent-1)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
-
-Requires: gsettings-desktop-schemas
+BuildRequires: pkgconfig(pangox)
%description
-MATE Desktop session manager
+This package contains a session that can be started from a display
+manager such as MDM. It will load all necessary applications for a
+full-featured user session.
%prep
%setup -q
-NOCONFIGURE=1 ./autogen.sh
+%patch0 -p1
%build
+NOCONFIGURE=1 ./autogen.sh
%configure --disable-static \
--enable-ipv6 \
--with-gtk=2.0 \
@@ -40,24 +47,18 @@ make %{?_smp_mflags} V=1
%install
make install DESTDIR=%{buildroot}
-
desktop-file-install \
--remove-category="MATE" \
--add-category="X-Mate" \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/mate-session-properties.desktop
-
-
%find_lang %{name}
-
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -69,6 +70,7 @@ fi
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
%files -f %{name}.lang
%doc AUTHORS COPYING README
%{_mandir}/man1/*
@@ -84,6 +86,12 @@ fi
%{_datadir}/xsessions/mate.desktop
%changelog
+* Fri Dec 21 2012 Nelson Marques <nmarques at fedoraproject.org> - 1.5.0-2
+- Add mate-session-manager-1.5.0-fix_schema.patch: fix segfault preventing
+ hibernation/suspend - BZ#888184
+- Add missing dependency for pangox-devel
+- Improved spec for readability
+
* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
- update to 1.5.0 release
- add requires gsettings-desktop-schemas
More information about the scm-commits
mailing list