From 75030a6f061760a84cb751977846b48512bf2d2e Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 07:18:52 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for wmx

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From 42d09bd6d31c13c82eacfa89b27e1ef1cafc05b9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:17:58 +0000
Subject: [PATCH 2/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8cca39f..cf137eb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := wmx
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 6bcf44688ad376232e15ca00c5087dbc1e780fd5 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo@fedoraproject.org>
Date: Tue, 2 Mar 2010 01:06:15 +0000
Subject: [PATCH 3/4] fixed directory ownership (BZ 569408)

---
 wmx.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/wmx.spec b/wmx.spec
index 51b80cb..10663a3 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -49,10 +49,14 @@ configurable options.
 %defattr(-,root,root)
 %doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
-%{_datadir}/*
+%{_datadir}/%{name}
+%{_datadir}/xsessions/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Mar 01 2010 Gabriel Somlo <somlo@cmu.edu> 7-6
+- fixed directory ownership (BZ 569408)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 8390ce1206f788dc62be67cfefe3fda8e715f1b3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:23:17 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 import.log               |  1 -
 4 files changed, 23 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch
 delete mode 100644 import.log

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cf137eb..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmx
-# $Id$
-NAME := wmx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12
diff --git a/import.log b/import.log
deleted file mode 100644
index 324f196..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-wmx-7-1_fc10:HEAD:wmx-7-1.fc10.src.rpm:1231785276