Merge branch 'master' into f13

Conflicts: .gitignore
- Update to 7.10, fixes #595135 and #619867 .
2010-09-27 21:28:07 +03:00 · 2010-09-27 21:26:31 +03:00 · 2010-07-29 11:38:30 +00:00 · 2010-07-29 11:38:23 +00:00 · 2010-05-20 20:12:56 +00:00 · 2010-04-16 15:54:46 +00:00
4 changed files with 32 additions and 5 deletions
@@ -1,2 +1,2 @@
-spectool-1.0.10.tar.bz2
-rpmdevtools-7.8.tar.xz
+/spectool-1.0.10.tar.bz2
+/rpmdevtools-7.10.tar.xz
@@ -3,7 +3,7 @@
 %global spectool_version   1.0.10

 Name:           rpmdevtools
-Version:        7.8
+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
@@ -29,7 +30,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
@@ -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,17 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Mon Sep 27 2010 Ville Skyttä <ville.skytta@iki.fi> - 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ä <ville.skytta@iki.fi> - 7.9-1
+- Update to 7.9, fixes #588313 and #589705.
+
+* Fri Apr 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-2
+- Require %%{_bindir}/man instead of man (#582932).
+
 * Tue Feb 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.8-1
 - Update to 7.8, fixes #562316.

@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-a495921f4c05cc92018f61cccf6fdfbf  rpmdevtools-7.8.tar.xz
+b2e7d7e8fbdbcae8c31b7249fd1dc615  rpmdevtools-7.10.tar.xz
@@ -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;
Author	SHA1	Message	Date
Ville Skyttä	bd58631c8d	Merge branch 'master' into f13 Conflicts: .gitignore	2010-09-27 21:28:07 +03:00
Ville Skyttä	65694a9c83	- Update to 7.10, fixes #595135 and #619867 . - Patch spectool to work with specfiles containing Icon and BuildArchitectures (#637000).	2010-09-27 21:26:31 +03:00
Fedora Release Engineering	73fdda6236	dist-git conversion	2010-07-29 11:38:30 +00:00
Fedora Release Engineering	05d24d16cd	dist-git conversion	2010-07-29 11:38:23 +00:00
Ville Skyttä	d983deaa69	- Update to 7.9, fixes #588313 and #589705 .	2010-05-20 20:12:56 +00:00
Ville Skyttä	8ba17b07e0	- Require %{_bindir}/man instead of man (#582932 ).	2010-04-16 15:54:46 +00:00
Jesse Keating	818f757ad9	Initialize branch F-13 for rpmdevtools	2010-02-17 03:04:28 +00:00
Ville Skyttä	b3408790ad	- Update to 7.8, fixes #562316 .	2010-02-15 22:14:22 +00:00
Ville Skyttä	6080e1381c	- Update to 7.7, fixes #558263 .	2010-02-01 22:51:52 +00:00
Ville Skyttä	a435d7b2d4	- Update to 7.6, fixes #528907 .	2009-12-07 20:50:04 +00:00
Bill Nottingham	e7bedcff4e	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-25 23:13:20 +00:00
Ville Skyttä	d3f2e953ce	- Update to 7.5, fixes #502403 .	2009-09-17 21:09:36 +00:00
Ville Skyttä	a33d3a18f2	- Update to 7.4, fixes #215927 and #466353 . - Patch spectool to make -s and -p to work as documented (Todd Zullinger).	2009-08-21 09:58:25 +00:00
Jesse Keating	1f405acaf3	- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild	2009-07-27 03:13:18 +00:00
Ville Skyttä	f1a55044c0	Doh.	2009-05-24 21:34:15 +00:00
Ville Skyttä	61dbb79aed	- Release 7.3. Sat May 23 2009 Ville Skyttä <ville.skytta at iki.fi> - Add rpmdev-packager - script for getting rpm packager info. - Use rpmdev-packager in rpmdev-bumpspec and rpmdev-init.el. - Fix rpmdev-extract MIME type comparisons with file(1) output containing parameters.	2009-05-24 21:29:51 +00:00
Ville Skyttä	9a552d4934	- Release 7.2. Sun May 3 2009 Ville Skyttä <ville.skytta at iki.fi> - Add dummy spec template for ad-hoc testing. Sat May 2 2009 Ville Skyttä <ville.skytta at iki.fi> - Improve newspec/newinit when only "-o foo" argument is given (#498588, thanks to Edwin ten Brink). - Try to get packager mail address for *Emacs rpm-spec-mode from ~/.fedora.cert if rpm-spec-user-mail-address is not set. - Add xz support to rpmdev-extract. Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - Make bumpspec's use of "head" POSIX compliant. Thu Apr 16 2009 Ville Skyttä <ville.skytta at iki.fi> - Add rpmdev-newinit for easier access to the init script template, move the template to %{_sysconfdir}/rpmdevtools, improve reload action example. Tue Apr 7 2009 Ville Skyttä <ville.skytta at iki.fi> - Speed up rpmls bash completion.	2009-05-21 14:48:30 +00:00