rpms/rpmdevtools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 7.10, fixes #595135 and #619867.

Browse Source 
- Patch spectool to work with specfiles containing Icon and BuildArchitectures
  (#637000).
This commit is contained in:
Ville Skyttä 2010-09-27 21:26:31 +03:00
parent 73fdda6236
commit 65694a9c83
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
spectool-1.0.10.tar.bz2 /spectool-1.0.10.tar.bz2
rpmdevtools-7.9.tar.xz /rpmdevtools-7.10.tar.xz

9
rpmdevtools.spec
View File

@ -3,7 +3,7 @@
%global spectool_version 1.0.10 %global spectool_version 1.0.10
Name: rpmdevtools Name: rpmdevtools
Version: 7.9 Version: 7.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM Development Tools Summary: RPM Development Tools
@ -14,6 +14,7 @@ URL: https://fedorahosted.org/rpmdevtools/
Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2 Source1: http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
Patch0: spectool-1.0.10-sourcenum.patch Patch0: spectool-1.0.10-sourcenum.patch
Patch1: spectool-1.0.10-problemtags-637000.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
@ -61,6 +62,7 @@ rpmdev-bumpspec Bump revision in specfile
cp -p spectool-%{spectool_version}/README README.spectool cp -p spectool-%{spectool_version}/README README.spectool
cd spectool-%{spectool_version} cd spectool-%{spectool_version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
cd .. cd ..
@ -114,6 +116,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * Thu May 20 2010 Ville Skyttä <ville.skytta@iki.fi> - 7.9-1
- Update to 7.9, fixes #588313 and #589705. - Update to 7.9, fixes #588313 and #589705.

2
sources
View File

@ -1,2 +1,2 @@
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2 d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
48b0c77432b2f2dfa8d8e67c2f565e7d rpmdevtools-7.9.tar.xz b2e7d7e8fbdbcae8c31b7249fd1dc615 rpmdevtools-7.10.tar.xz

14
spectool-1.0.10-problemtags-637000.patch Normal file
View File

@ -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;