From 7116da123c85fd51d92904f7521a26bafe00e1e2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:59:16 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for xdx --- 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 cb6a2c537c6072967d7826ae8f3aa7feb12c034a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Sun, 21 Dec 2008 18:09:16 +0000 Subject: [PATCH 2/4] new upstream release --- sources | 2 +- xdx.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 26dadf3..bd807ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9834e9759f7d6a0b7b2fe200020551d7 xdx-2.4.tar.gz +b6ba2d4fb8dd3b9cf2806902a7a284e7 xdx-2.4.1.tar.gz diff --git a/xdx.spec b/xdx.spec index 3915d24..66aa770 100644 --- a/xdx.spec +++ b/xdx.spec @@ -1,6 +1,6 @@ Name: xdx -Version: 2.4 -Release: 2%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: DX-cluster tcp/ip client for amateur radio Group: Applications/Communications @@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 22 2008 Sindre Pedersen Bjørdal 2.4.1-1 +- Upstream update + * Thu Feb 28 2008 Robert 'Bob' Jensen 2.4-2 - Submit for review From 84b5b3a37e9f2387e7e3d4dd7bd31435da7e8711 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:27 +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 2129159..0c7bb5d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xdx 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 09585c99cf33b60869d80c5d7c0dcd239654be2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:45 +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 0c7bb5d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xdx -# $Id$ -NAME := xdx -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