From 024591aad5a2b36af8a4288887f5eebba448fa04 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:12:41 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for appliance-tools --- 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 f5996d3195bca760d0e63207e172108e392b25ca Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:28 +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 1b5efea..0a4cb11 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: appliance-tools -# $Id$ +# $Id: Makefile,v 1.1 2008/08/07 20:54:04 kevin Exp $ NAME := appliance-tools 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 34660c4a18cc1ca54b2e487324b7cfca7755f884 Mon Sep 17 00:00:00 2001 From: David Huff Date: Wed, 10 Feb 2010 15:14:51 +0000 Subject: [PATCH 3/5] - Fixed error while installing grub - Fixed issue with Fedora 12 using dracut to generate initrd - Fixed issue with Fedora 12 parted error --- appliance-tools.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/appliance-tools.spec b/appliance-tools.spec index 77c9541..72cec66 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -4,14 +4,14 @@ Summary: Tools for building Appliances Name: appliance-tools -Version: 004.4 -Release: 3%{?dist} +Version: 004.5 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base -URL: http://git.et.redhat.com/?p=act.git +URL: http://thincrust.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone git://git.et.redhat.com/act.git; cd act +# git clone git://git.fedorahosted.org/appliance-tools.git # git archive --format=tar --prefix=appliance-tools-%{version} appliance-tools-%{version} | bzip2 > appliance-tools-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -59,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/ec2convert/*.pyc %changelog +* Tue Feb 09 2010 David Huff - 004.5-1 +- Fixed error while installing grub +- Fixed issue with Fedora 12 using dracut to generate initrd +- Fixed issue with Fedora 12 parted error + * Fri Jul 24 2009 Fedora Release Engineering - 004.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 72123e32a9743f16ba0c85ebb5d660afa94c6423 Mon Sep 17 00:00:00 2001 From: David Huff Date: Wed, 10 Feb 2010 15:16:39 +0000 Subject: [PATCH 4/5] added new source file appliance-tools-004.5.tar.bz2 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9f1f087..92b15c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -appliance-tools-004.4.tar.bz2 +appliance-tools-004.5.tar.bz2 diff --git a/sources b/sources index e76dd3b..d7efd80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d3b9557165a281f9cc12e6f67f6ce33 appliance-tools-004.4.tar.bz2 +60b3b778a075d6683354d8c11f735932 appliance-tools-004.5.tar.bz2 From a18aab408e002f939584b85aba75a4a0278fc187 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:06:02 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 3 --- 4 files changed, 25 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 0a4cb11..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: appliance-tools -# $Id: Makefile,v 1.1 2008/08/07 20:54:04 kevin Exp $ -NAME := appliance-tools -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 0f9ad15..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -appliance-tools-003-1_fc10:HEAD:appliance-tools-003-1.fc10.src.rpm:1219422935 -appliance-tools-004-1_fc10:HEAD:appliance-tools-004-1.fc10.src.rpm:1228130661 -appliance-tools-004_4-2_fc12:HEAD:appliance-tools-004.4-2.fc12.src.rpm:1247756755