From f9656a6bac32637a1ef9bf266df054966504c3a3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:09:35 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for virt-df --- 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 573ea198f62251a7c9bce011fd72976a82377bc2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Mar 2009 11:22:14 +0000 Subject: [PATCH 2/4] New upstream version 2.1.5. --- .cvsignore | 3 +-- sources | 2 +- virt-df.spec | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d3675ca..9b5e5f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -virt-df-2.1.3.tar.gz -virt-df-2.1.4.tar.gz +virt-df-2.1.5.tar.gz diff --git a/sources b/sources index a01dd0e..ab71a8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2669e1d701948355632f2d74889ce115 virt-df-2.1.4.tar.gz +b9143047ca1c4afdc461e3f5c4e47058 virt-df-2.1.5.tar.gz diff --git a/virt-df.spec b/virt-df.spec index ea9418e..685e991 100644 --- a/virt-df.spec +++ b/virt-df.spec @@ -3,8 +3,8 @@ %define _default_patch_fuzz 2 Name: virt-df -Version: 2.1.4 -Release: 2%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: Utility like 'df' for virtual guests Group: Development/Libraries @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 10 2009 Richard W.M. Jones - 2.1.5-1 +- New upstream version 2.1.5. + * Tue Oct 21 2008 Richard W.M. Jones - 2.1.4-2 - Fix incorrect sources file. - Remove bogus Plural-Forms line from zh_CN PO file. From c03f733b4297149c526ab2fcd913a7126f2280bc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:28 +0000 Subject: [PATCH 3/4] 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 bc15d3b..a13e7d4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: virt-df -# $Id$ +# $Id: Makefile,v 1.1 2008/05/19 16:08:22 kevin Exp $ NAME := virt-df 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 cc6db979f6da0ac953db9fe43c43000917243dea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:04:40 +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 a13e7d4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virt-df -# $Id: Makefile,v 1.1 2008/05/19 16:08:22 kevin Exp $ -NAME := virt-df -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 diff --git a/import.log b/import.log deleted file mode 100644 index 6814b06..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virt-df-2_1_2-1_fc10:HEAD:virt-df-2.1.2-1.fc10.src.rpm:1215778938