From dbeecb2bec17fae51d283cc373c1d590084c70bc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:47:30 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for xfsdump --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From a7b1859d177e3c7d482112ea4ad97cbb37f04048 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 16 Jun 2009 16:26:32 +0000 Subject: [PATCH 2/4] - New upstream release --- .cvsignore | 2 +- sources | 2 +- xfsdump.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcf7797..dd3543d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfsdump-3.0.0.tar.gz +xfsdump-3.0.1.tar.gz diff --git a/sources b/sources index d1c0b5e..6b85b7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63f05d3d131cedae2a1cdf78b47e448d xfsdump-3.0.0.tar.gz +48a65424ccc359f81426b74715c15802 xfsdump-3.0.1.tar.gz diff --git a/xfsdump.spec b/xfsdump.spec index 46c1e61..89126a2 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -1,7 +1,7 @@ Summary: Administrative utilities for the XFS filesystem Name: xfsdump -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +Release: 1%{?dist} # Licensing based on generic "GNU GENERAL PUBLIC LICENSE" # in source, with no mention of version. License: GPL+ @@ -9,7 +9,7 @@ Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ Source0: ftp://oss.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, libtool, gettext, gawk +BuildRequires: libtool, gettext, gawk BuildRequires: xfsprogs-devel, e2fsprogs-devel, libattr-devel ncurses-devel Requires: xfsprogs >= 2.6.30, attr >= 2.0.0 @@ -34,7 +34,6 @@ subtrees may be restored from full or partial backups. %setup -q %build -autoconf %configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ --sbindir=/sbin --bindir=%{_sbindir} \ --enable-lib64=yes @@ -61,11 +60,14 @@ rm -rf $RPM_BUILD_ROOT /sbin/* %changelog +* Tue May 05 2009 Eric Sandeen 3.0.1-1 +- New upstream release + * Thu Feb 26 2009 Fedora Release Engineering - 3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Wed Feb 04 2009 Eric Sandeen 3.0.0-1 --New upstream release +- New upstream release * Wed Nov 12 2008 Eric Sandeen 2.2.48-2 - Enable parallel builds From 95cdd920a22a3d18211ac8e3eedc3880110f76a8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:00 +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 05fdd8a..9976b28 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xfsdump -# $Id$ +# $Id: Makefile,v 1.1 2006/09/01 17:26:02 cattelan Exp $ NAME := xfsdump 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 d91e4cabc842f22b4cae5f47439ef2b9ef125daf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:51:29 +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 9976b28..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfsdump -# $Id: Makefile,v 1.1 2006/09/01 17:26:02 cattelan Exp $ -NAME := xfsdump -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11