From c0c2b7b24f5b4af82c5c023a0d647d57fdea1a6c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:06:17 +0000 Subject: [PATCH 1/4] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 2448079acd9c8c0663dc2186041bed2564bd57dc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sun, 30 Aug 2009 12:47:37 +0000 Subject: [PATCH 2/4] - updated to 5.28 - applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379) --- .cvsignore | 2 +- sources | 2 +- xlockmore-fix_petri.patch | 11 +++++++++++ xlockmore.spec | 16 ++++++++++++++-- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 xlockmore-fix_petri.patch diff --git a/.cvsignore b/.cvsignore index f4b98fe..a3e37fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xlockmore-5.26.1.tar.bz2 +xlockmore-5.28.tar.bz2 diff --git a/sources b/sources index d0d8305..dd75294 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db7faeb82074a5a1593ce60297c13f20 xlockmore-5.26.1.tar.bz2 +76bd1c42f1d1f2d9ea3d2d1837f7469e xlockmore-5.28.tar.bz2 diff --git a/xlockmore-fix_petri.patch b/xlockmore-fix_petri.patch new file mode 100644 index 0000000..f1dac93 --- /dev/null +++ b/xlockmore-fix_petri.patch @@ -0,0 +1,11 @@ +--- modes/petri.c.orig 2009-08-20 08:05:37.000000000 +0200 ++++ modes/petri.c 2009-08-20 08:05:46.000000000 +0200 +@@ -217,7 +217,7 @@ + cell *arr; + cell *head; + cell *tail; +- int count; ++ unsigned int count; + Bool originalcolors; + GC *coloredGCs; + int blastcount; diff --git a/xlockmore.spec b/xlockmore.spec index ee9d5a8..512b68f 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -1,11 +1,12 @@ Summary: Screen lock and screen saver Name: xlockmore -Version: 5.26.1 +Version: 5.28 Release: 1%{?dist} License: BSD Group: Amusements/Graphics URL: http://www.tux.org/~bagleyd/xlockmore.html -Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2 +Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2 +Patch0: xlockmore-fix_petri.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel esound-devel BuildRequires: mesa-libGL-devel mesa-libGLU-devel @@ -34,6 +35,7 @@ GTK based frontend for xlockmore. %prep %setup -q +%patch0 %{__sed} -i -e "s,/lib,/%{_lib},g" configure @@ -107,6 +109,16 @@ desktop-file-install \ %{_bindir}/xglock %changelog +* Sun Aug 30 2009 Adrian Reber - 5.28-1 +- updated to 5.28 +- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379) + +* Mon Jul 27 2009 Fedora Release Engineering - 5.26.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 5.26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Aug 09 2008 Adrian Reber - 5.26.1-1 - updated to 5.26.1 From b248f1bbdaca996094f18d6958f976aed025c81f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:59 +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 726414d740de6c5a9a19290981cd04dd539dc246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:54:50 +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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10