From 2dbf06c8fe81ce8114bcaaa204ab443fa261a164 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Jul 26 2013 23:35:32 +0000
Subject: fix merge conflict in .gitignore


---

diff --git a/.gitignore b/.gitignore
index c566040..084d9e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 /mate-session-manager-1.4.0.tar.xz
 /mate-session-manager-1.5.0.tar.xz
 /mate-session-manager-1.5.1.tar.xz
-<<<<<<< HEAD
 /mate-session-manager-1.5.2.tar.xz
-=======
 /mate-session-manager-1.6.0.tar.xz
->>>>>>> master
+/mate-session-manager-1.6.1.tar.xz
diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 84e430e..44f4455 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,27 +1,32 @@
 Name:           mate-session-manager
-Version:        1.6.0
-Release:        4%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        MATE Desktop session manager
 License:        GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
-#Patch from upstream to fix race condition that launches multiple caja windows on first login
-#Patch0:         x-caja.patch
-
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk2-devel
-BuildRequires:  icon-naming-utils
 BuildRequires:  libSM-devel
 BuildRequires:  mate-common
-BuildRequires:  mate-icon-theme
-BuildRequires:  mate-polkit-devel
 BuildRequires:  pango-devel
-BuildRequires:  polkit-devel
 BuildRequires:  upower-devel
 BuildRequires:  systemd-devel
 BuildRequires:  xmlto
+BuildRequires:  libXtst-devel
+BuildRequires:  xorg-x11-xtrans-devel
+BuildRequires:  tcp_wrappers-devel
+
+Requires: system-logos
+# Needed for mate-settings-daemon
+Requires: mate-control-center
+# we need an authentication agent in the session
+Requires: mate-polkit
+# and we want good defaults
+Requires: polkit-desktop-policy
+Requires: hicolor-icon-theme
 
 %description
 This package contains a session that can be started from a display
@@ -30,15 +35,18 @@ full-featured user session.
 
 %prep
 %setup -q
-#%patch0 -p1
  
 %build
-NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static \
            --enable-ipv6 \
            --with-gtk=2.0 \
            --with-default-wm=marco \
            --with-systemd \
+%if 0%{?fedora} > 19
+           --docdir=%{_datadir}/doc/%{name} \
+%else
+           --docdir=%{_datadir}/doc/%{name}-%{version} \
+%endif
            --with-x
 
 make %{?_smp_mflags} V=1
@@ -50,6 +58,10 @@ desktop-file-install                               \
         --delete-original                          \
         --dir=%{buildroot}%{_datadir}/applications \
 %{buildroot}%{_datadir}/applications/mate-session-properties.desktop
+
+# remove needless gsettings convert file
+rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/mate-session.convert
+
 %find_lang %{name}
 
 %post
@@ -75,15 +87,27 @@ fi
 %{_bindir}/mate-session-save
 %{_bindir}/mate-wm
 %{_datadir}/applications/mate-session-properties.desktop
-%{_datadir}/mate-session
+%{_datadir}/mate-session-manager
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/mate-session-properties.svg
 %{_datadir}/glib-2.0/schemas/org.mate.session.gschema.xml
 %{_datadir}/xsessions/mate.desktop
-%{_datadir}/doc/mate-session
-%{_datadir}/MateConf/gsettings/mate-session.convert
+
 
 %changelog
+* Fri Jul 26 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-1
+- drop comment out patch from spec file
+- remove unnecessary BRs
+- add pangox-compat-devel instead as pango-devel as BR
+- add BR libXtst-devel
+- add BR xorg-x11-xtrans-devel
+- add BR tcp_wrappers-devel
+- remove NOCONFIGURE=1 ./autogen.sh
+- add some runtime requires
+- remove needless gsettings convert file
+- change doc dir for f20
+- fix file section for 1.6.1 release
+
 * Mon Jun 17 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-4
 - Drop the caja patch
 - Build against latest systemd
diff --git a/sources b/sources
index b9e1354..7212f88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8e1e83cabbf0ec3ec130c07f9038dcd  mate-session-manager-1.6.0.tar.xz
+e841ff0917f8b64ad33267b0eb5f8364  mate-session-manager-1.6.1.tar.xz