[xorg-x11-xinit/f12/master] Conflicts: xorg-x11-xinit.spec

[Matej Cepl]

commit 0a4e866ea6df05bbc0bc156fb92233359156ceac
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 27 16:09:01 2010 +0200

    Conflicts:
    	xorg-x11-xinit.spec

 xorg-x11-xinit.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index c6eba0d..b8171fd 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.9
-Release:   16%{?dist}
+Release:   18%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -114,10 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README ChangeLog
-%attr(755,-,root) %{_bindir}/startx
-%attr(755,-,root) %{_bindir}/xinit
-%attr(755,-,root) %{_bindir}/ck-xinit-session
-%attr(755,-,root) %{_libexecdir}/xinit-compat
+%{_bindir}/startx
+%{_bindir}/xinit
+%{_bindir}/ck-xinit-session
 %dir %{_sysconfdir}/X11/xinit
 %{_sysconfdir}/X11/xinit/xinitrc
 %{_sysconfdir}/X11/xinit/xinitrc-common
@@ -134,15 +133,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files session
 %defattr(-, root, root)
+%attr(755,root,root) %{_libexecdir}/xinit-compat
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
-* Wed Jul 14 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.9-16
+* Fri Aug 27 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.9-18
+- Fix ownership of files.
+
+* Tue Aug 24 2010 Adam Tkac <atkac redhat com> - 1.0.9-17
+- rebuild to ensure F14 has higher NVR than F13
+
+* Wed Mar 24 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.9-16
+- Remove explicit %%attr from _bindir
 - Add missing bang to shebang
 
 * Thu Feb 04 2010 Matěj Cepl <mcepl at redhat.com> - 1.0.9-15
 - Add xinit-compat script
   Patch from Rex Dieter, bug 540546
+  Move xinit-compat script to -session subpackage.
 
 * Fri Jan 29 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.0.9-14
 - Eliminate dependency on which.