From 8ba17b07e067679062cbc6297534ec3d2d112ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 16 Apr 2010 15:54:46 +0000 Subject: [PATCH 1/4] - Require %{_bindir}/man instead of man (#582932). --- rpmdevtools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 89c3c93..6a33cae 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -4,7 +4,7 @@ Name: rpmdevtools Version: 7.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -29,7 +29,7 @@ Requires: file Requires: findutils Requires: gawk Requires: grep -Requires: man +Requires: %{_bindir}/man Requires: python >= 2.4 Requires: rpm-build >= 4.4.2.3 Requires: rpm-python @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 16 2010 Ville Skyttä - 7.8-2 +- Require %%{_bindir}/man instead of man (#582932). + * Tue Feb 16 2010 Ville Skyttä - 7.8-1 - Update to 7.8, fixes #562316. From d983deaa692dede834dae0bb976fdf9054f96adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 20 May 2010 20:12:56 +0000 Subject: [PATCH 2/4] - Update to 7.9, fixes #588313 and #589705. --- .cvsignore | 2 +- rpmdevtools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4507054..379f7b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ spectool-1.0.10.tar.bz2 -rpmdevtools-7.8.tar.xz +rpmdevtools-7.9.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 6a33cae..b0ddcbb 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,8 +3,8 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.8 -Release: 2%{?dist} +Version: 7.9 +Release: 1%{?dist} Summary: RPM Development Tools Group: Development/Tools @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 20 2010 Ville Skyttä - 7.9-1 +- Update to 7.9, fixes #588313 and #589705. + * Fri Apr 16 2010 Ville Skyttä - 7.8-2 - Require %%{_bindir}/man instead of man (#582932). diff --git a/sources b/sources index ddf2c5b..9131e6b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz +48b0c77432b2f2dfa8d8e67c2f565e7d rpmdevtools-7.9.tar.xz From 73fdda6236d2226c6b1dc4c9878d9eca6507f15d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:38:30 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From 65694a9c83de2ae8f28d6f2dc0bcf99bcfbeed6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 27 Sep 2010 21:26:31 +0300 Subject: [PATCH 4/4] - Update to 7.10, fixes #595135 and #619867. - Patch spectool to work with specfiles containing Icon and BuildArchitectures (#637000). --- .gitignore | 4 ++-- rpmdevtools.spec | 9 ++++++++- sources | 2 +- spectool-1.0.10-problemtags-637000.patch | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 spectool-1.0.10-problemtags-637000.patch diff --git a/.gitignore b/.gitignore index 379f7b2..e7d16f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -spectool-1.0.10.tar.bz2 -rpmdevtools-7.9.tar.xz +/spectool-1.0.10.tar.bz2 +/rpmdevtools-7.10.tar.xz diff --git a/rpmdevtools.spec b/rpmdevtools.spec index b0ddcbb..df38910 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -3,7 +3,7 @@ %global spectool_version 1.0.10 Name: rpmdevtools -Version: 7.9 +Version: 7.10 Release: 1%{?dist} Summary: RPM Development Tools @@ -14,6 +14,7 @@ URL: https://fedorahosted.org/rpmdevtools/ Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 Patch0: spectool-1.0.10-sourcenum.patch +Patch1: spectool-1.0.10-problemtags-637000.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -61,6 +62,7 @@ rpmdev-bumpspec Bump revision in specfile cp -p spectool-%{spectool_version}/README README.spectool cd spectool-%{spectool_version} %patch0 -p1 +%patch1 -p1 cd .. @@ -114,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 27 2010 Ville Skyttä - 7.10-1 +- Update to 7.10, fixes #595135 and #619867. +- Patch spectool to work with specfiles containing Icon or BuildArchitectures + (#637000). + * Thu May 20 2010 Ville Skyttä - 7.9-1 - Update to 7.9, fixes #588313 and #589705. diff --git a/sources b/sources index 9131e6b..2dee1ff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 -48b0c77432b2f2dfa8d8e67c2f565e7d rpmdevtools-7.9.tar.xz +b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz diff --git a/spectool-1.0.10-problemtags-637000.patch b/spectool-1.0.10-problemtags-637000.patch new file mode 100644 index 0000000..047b526 --- /dev/null +++ b/spectool-1.0.10-problemtags-637000.patch @@ -0,0 +1,14 @@ +https://bugzilla.redhat.com/637000 + +diff -up spectool-1.0.10/spectool~ spectool-1.0.10/spectool +--- spectool-1.0.10/spectool~ 2008-02-12 12:32:21.000000000 +0200 ++++ spectool-1.0.10/spectool 2010-09-27 19:17:31.483281717 +0300 +@@ -108,7 +108,7 @@ sub eval_sources_patches { + last; + } + } +- next if ($line =~ m/^\s*(BuildArch|Exclu(d|siv)e(Arch|OS))\s*:/i); ++ next if ($line =~ m/^\s*(BuildArch(itectures)?|Exclu(d|siv)e(Arch|OS)|Icon)\s*:/i); + $preamble .= $line; + if ($line !~ m/^\s*(?:source|patch)\d*\s*:/) { + print $tmpspec_fh $line;