From ffa873432769edf551155b5e48367fda6f23686e Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 22 Apr 2008 02:50:38 +0000
Subject: [PATCH 1/4] Initialize branch F-9 for xlockmore

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

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

From 9c84ff7ea5b30b27becedff9becbb038986f2e1b Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Sun, 10 Aug 2008 04:28:13 +0000
Subject: [PATCH 2/4] - updated to 5.26.1

---
 .cvsignore     | 2 +-
 sources        | 2 +-
 xlockmore.spec | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 47e26cf..f4b98fe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xlockmore-5.25.tar.bz2
+xlockmore-5.26.1.tar.bz2
diff --git a/sources b/sources
index 65e12ec..d0d8305 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d25b656e11b90f2e2d4244883d639fb  xlockmore-5.25.tar.bz2
+db7faeb82074a5a1593ce60297c13f20  xlockmore-5.26.1.tar.bz2
diff --git a/xlockmore.spec b/xlockmore.spec
index 5efa179..ee9d5a8 100644
--- a/xlockmore.spec
+++ b/xlockmore.spec
@@ -1,11 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.25
+Version: 5.26.1
 Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.25.tar.bz2
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
@@ -50,6 +50,8 @@ GTK based frontend for xlockmore.
 %{__install} -p -D -m0644 xlock/xlock.man %{buildroot}%{_mandir}/man1/xlock.1
 %{__install} -p -D -m0644 xlock/XLock.ad %{buildroot}%{_libdir}/X11/app-defaults/XLock
 %{__install} -p -D -m0644 xmlock/XmLock.ad %{buildroot}%{_libdir}/X11/app-defaults/XmLock
+%{__chmod} 644 README
+%{__chmod} 644 docs/Revisions
 
 
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/pam.d
@@ -105,6 +107,9 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sat Aug 09 2008 Adrian Reber <adrian@lisas.de> - 5.26.1-1
+- updated to 5.26.1
+
 * Mon Feb 18 2008 Adrian Reber <adrian@lisas.de> - 5.25-1
 - updated to 5.25
 

From 808a2f60ef0f53df27ddb809418fe002f38b6cf8 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:34:00 +0000
Subject: [PATCH 3/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 2a18cb7..2873df0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := xlockmore
 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 bac592f517f81c6cd190c3cd79e63e35fb5c16ab Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:54:52 +0000
Subject: [PATCH 4/4] dist-git conversion

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

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 2873df0..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xlockmore
-# $Id$
-NAME := xlockmore
-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 1c26f78..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-9