Compare commits

..

5 Commits

Author SHA1 Message Date
Fedora Release Engineering 0d7a7c1a75 dist-git conversion 2010-07-29 11:38:26 +00:00
Ville Skyttä ba8f9b73f2 - Update to 7.8, fixes #562316. 2010-02-15 22:24:05 +00:00
Ville Skyttä 852e2a5e92 - Update to 7.7, fixes #558263.
Mon Dec 7 2009 Ville Skyttä <ville.skytta@iki.fi> - 7.6-1
- Update to 7.6, fixes #528907.
2010-02-03 20:11:42 +00:00
Bill Nottingham 7a4f915cf8 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:29:16 +00:00
Jesse Keating eddc9a8cc9 Initialize branch F-12 for rpmdevtools 2009-09-29 06:43:57 +00:00
4 changed files with 5 additions and 32 deletions
+2 -2
View File
@@ -1,2 +1,2 @@
/spectool-1.0.10.tar.bz2
/rpmdevtools-7.10.tar.xz
spectool-1.0.10.tar.bz2
rpmdevtools-7.8.tar.xz
+2 -15
View File
@@ -3,7 +3,7 @@
%global spectool_version 1.0.10
Name: rpmdevtools
Version: 7.10
Version: 7.8
Release: 1%{?dist}
Summary: RPM Development Tools
@@ -14,7 +14,6 @@ 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
@@ -30,7 +29,7 @@ Requires: file
Requires: findutils
Requires: gawk
Requires: grep
Requires: %{_bindir}/man
Requires: man
Requires: python >= 2.4
Requires: rpm-build >= 4.4.2.3
Requires: rpm-python
@@ -62,7 +61,6 @@ rpmdev-bumpspec Bump revision in specfile
cp -p spectool-%{spectool_version}/README README.spectool
cd spectool-%{spectool_version}
%patch0 -p1
%patch1 -p1
cd ..
@@ -116,17 +114,6 @@ 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 -1
View File
@@ -1,2 +1,2 @@
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz
a495921f4c05cc92018f61cccf6fdfbf rpmdevtools-7.8.tar.xz
-14
View File
@@ -1,14 +0,0 @@
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;