From eddc9a8cc9648e584518d2a40cebd90b437ec048 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:43:57 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for rpmdevtools --- 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 7a4f915cf84fffcfe24224819c48b2834d054534 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:16 +0000 Subject: [PATCH 2/5] 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 3971401..5e3f83e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := rpmdevtools 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 852e2a5e921479a7b34ef0bc6d00573218768be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 3 Feb 2010 20:11:42 +0000 Subject: [PATCH 3/5] =?UTF-8?q?-=20Update=20to=207.7,=20fixes=20#558263.?= =?UTF-8?q?=20Mon=20Dec=207=202009=20Ville=20Skytt=C3=A4=20=20-=207.6-1=20-=20Update=20to=207.6,=20fixes=20#528907.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- rpmdevtools.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d76cb84..0889643 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.5.tar.xz +rpmdevtools-7.7.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index ec80ecf..57c2526 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.5 +Version: 7.7 Release: 1%{?dist} Summary: RPM Development Tools @@ -31,7 +31,7 @@ Requires: gawk Requires: grep Requires: man Requires: python >= 2.4 -Requires: rpm-build >= 4.4.2.1 +Requires: rpm-build >= 4.4.2.3 Requires: rpm-python Requires: sed Requires: wget @@ -114,6 +114,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 2 2010 Ville Skyttä - 7.7-1 +- Update to 7.7, fixes #558263. + +* Mon Dec 7 2009 Ville Skyttä - 7.6-1 +- Update to 7.6, fixes #528907. + * Thu Sep 17 2009 Ville Skyttä - 7.5-1 - Update to 7.5, fixes #502403. diff --git a/sources b/sources index 3e1f94c..d1b0ce5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -ec396743a9d350ac4a6d5a104807ccca rpmdevtools-7.5.tar.xz +b6c935120963107693a252336f1b4db6 rpmdevtools-7.7.tar.xz From ba8f9b73f2170af12c283a36c0b04968ebfabaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 15 Feb 2010 22:24:05 +0000 Subject: [PATCH 4/5] - Update to 7.8, fixes #562316. --- .cvsignore | 2 +- rpmdevtools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0889643..4507054 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.7.tar.xz +rpmdevtools-7.8.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 57c2526..89c3c93 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.7 +Version: 7.8 Release: 1%{?dist} Summary: RPM Development Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 16 2010 Ville Skyttä - 7.8-1 +- Update to 7.8, fixes #562316. + * Tue Feb 2 2010 Ville Skyttä - 7.7-1 - Update to 7.7, fixes #558263. diff --git a/sources b/sources index d1b0ce5..ddf2c5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -b6c935120963107693a252336f1b4db6 rpmdevtools-7.7.tar.xz +a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz From 0d7a7c1a75b9bfa1cc6b23b0b2ef885728ef2f33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:26 +0000 Subject: [PATCH 5/5] 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 5e3f83e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rpmdevtools -# $Id$ -NAME := rpmdevtools -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