[xfce4-session] Update to 4.10.1, drop upstreamed patches.
Kevin Fenzi
kevin at fedoraproject.org
Sun May 5 16:59:08 UTC 2013
commit 98c266e0e9a597b370cd323fc039b1db1709b9c3
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sun May 5 10:59:04 2013 -0600
Update to 4.10.1, drop upstreamed patches.
.gitignore | 1 +
sources | 2 +-
xfce4-session-4.10.0-add-systemd-support.patch | 413 ------------------------
xfce4-session-4.10.0-glib2.patch | 79 -----
xfce4-session-4.10.0-session-save.patch | 147 ---------
xfce4-session.spec | 48 +--
6 files changed, 18 insertions(+), 672 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aac6abd..d697a33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xfce4-session-4.6.2.tar.bz2
/xfce4-session-4.9.1.tar.bz2
/xfce4-session-4.9.2.tar.bz2
/xfce4-session-4.10.0.tar.bz2
+/xfce4-session-4.10.1.tar.bz2
diff --git a/sources b/sources
index 034d725..74f8dd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4768e1a41a0287af6aad18b329a0f230 xfce4-session-4.10.0.tar.bz2
+1757657c1d590aa6274b7b7cbba33352 xfce4-session-4.10.1.tar.bz2
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 45fb6f9..66e3650 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -1,8 +1,8 @@
%global xfceversion 4.10
Name: xfce4-session
-Version: 4.10.0
-Release: 8%{?dist}
+Version: 4.10.1
+Release: 1%{?dist}
Summary: Xfce session manager
Group: User Interface/Desktops
@@ -13,20 +13,6 @@ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
# taken from polkit-gnome, license is LGPLv2+, requires because of
# http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html
Source1: polkit-gnome-authentication-agent-1.desktop
-# Fix logout with multiple sessions asking for save.
-# https://bugzilla.xfce.org/show_bug.cgi?id=5379
-# http://git.xfce.org/xfce/xfce4-session/patch/?id=9f3077be682355e1cd07e9a9463e76307292208c
-Patch1: xfce4-session-4.10.0-session-save.patch
-# add systemd-logind support.
-# initial Patch from arch linux / https://bugzilla.xfce.org/show_bug.cgi?id=8729
-# added suspend,hibernate support
-Patch2: xfce4-session-4.10.0-add-systemd-support.patch
-#
-# fix for some glib2 crasher issues.
-# commit dee0200fa5dc4de064f288281ddd13199ba7fcde
-# commit ab391138cacc62ab184a338e237c4430356b41f9
-# https://bugzilla.xfce.org/show_bug.cgi?id=9709
-Patch3: xfce4-session-4.10.0-glib2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,12 +36,11 @@ BuildRequires: intltool
BuildRequires: libxslt
BuildRequires: gnome-doc-utils
#BuildRequires: libxml2
-BuildRequires: xfce4-dev-tools
+# On f19+ we build with systemd support
+%if 0%{?rhel} > 6 || 0%{?fedora} > 18
BuildRequires: systemd-devel >= 195
+%endif
BuildRequires: polkit-devel
-# Needed since we regen auto files for systemd patch.
-BuildRequires: xfce4-dev-tools
-BuildRequires: libtool
Requires: xorg-x11-server-utils
Requires: polkit-gnome
Requires: systemd >= 195
@@ -86,19 +71,15 @@ Additional splash screen engines for the Xfce Session Manager.
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
%build
-/usr/bin/xdt-autogen
-%configure --disable-static \
- --enable-gnome \
- --enable-libgnome-keyring \
- --enable-session-screenshots \
- --enable-panel-plugin \
- --enable-systemd
-
+%configure \
+%if 0%{?rhel} > 6 || 0%{?fedora} > 18
+ --enable-systemd \
+%else
+ --disable-systemd \
+%endif
+ --disable-static
+
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} V=1
@@ -170,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/themes/Default/balou/
%changelog
+* Sun May 05 2013 Kevin Fenzi <kevin at scrye.com> 4.10.1-1
+- Update to 4.10.1, drop upstreamed patches.
+
* Sat Apr 27 2013 Kevin Fenzi <kevin at scrye.com> 4.10.0-8
- Add upstream patches to hopefully fix crashes with glib2.
- Fixes bug #891113 #865539
More information about the scm-commits
mailing list