From 4e27dfd9da479a66540c73a13fca6e7ff3a3dffc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:16:39 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for lcdproc --- 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 d640c93abea5f13b6266f1bcfa19a48f7cabec80 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:44:50 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 11d537e..7e9b620 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: lcdproc -# $Id$ +# $Id: Makefile,v 1.1 2007/05/21 17:27:39 wtogami Exp $ NAME := lcdproc 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 0fc4d7031d8e4c50c870c35624fd9447eec6616e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 18 Apr 2010 20:10:00 +0000 Subject: [PATCH 3/5] - Remove Uneeded BR - rhbz#572621 - Rebuild for libftdi update - rhbz#581601 --- lcdproc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lcdproc.spec b/lcdproc.spec index b5b6e13..c07d7ed 100644 --- a/lcdproc.spec +++ b/lcdproc.spec @@ -1,7 +1,7 @@ Summary: LCDproc displays real-time system information on a 20x4 backlit LCD Name: lcdproc Version: 0.5.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://lcdproc.omnipotent.net Group: System Environment/Libraries @@ -138,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT __doc %changelog +* Sun Apr 18 2010 Nicolas Chauvet - 0.5.3-5 +- Remove Uneeded BR - rhbz#572621 +- Rebuild for libftdi update - rhbz#581601 + * Thu Sep 10 2009 Jarod Wilson - 0.5.3-4 - Add BR: libftdi-devel to build lis driver (#522270) From 2183348e260c8be18749bdb9b58e158758b25d36 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 18 Apr 2010 20:11:41 +0000 Subject: [PATCH 4/5] Fix commit --- lcdproc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/lcdproc.spec b/lcdproc.spec index c07d7ed..759e3c7 100644 --- a/lcdproc.spec +++ b/lcdproc.spec @@ -16,7 +16,6 @@ BuildRequires: graphviz BuildRequires: libusb-devel BuildRequires: lirc-devel BuildRequires: ncurses-devel -BuildRequires: nfs-utils-lib-devel BuildRequires: openldap-devel BuildRequires: pth-devel BuildRequires: xmlto From b909100ebb5db18cab321401de3b3a7037f53898 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:34:03 +0000 Subject: [PATCH 5/5] 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 7e9b620..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: lcdproc -# $Id: Makefile,v 1.1 2007/05/21 17:27:39 wtogami Exp $ -NAME := lcdproc -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 91592a6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -lcdproc-0_5_2-9_fc10:HEAD:lcdproc-0.5.2-9.fc10.src.rpm:1236187012