rpms/rpmdevtools/devel spectool-1.0.10-sourcenum.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 rpmdevtools.spec, 1.20, 1.21 sources, 1.18, 1.19
Ville Skyttä
scop at fedoraproject.org
Fri Aug 21 09:58:26 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/rpmdevtools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21757
Modified Files:
.cvsignore rpmdevtools.spec sources
Added Files:
spectool-1.0.10-sourcenum.patch
Log Message:
* Fri Aug 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 7.4-1
- Update to 7.4, fixes #215927 and #466353.
- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
spectool-1.0.10-sourcenum.patch:
spectool | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE spectool-1.0.10-sourcenum.patch ---
Fix for -s x,y, -p x,y from Todd Zullinger:
https://www.redhat.com/archives/fedora-devel-list/2009-August/msg00621.html
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 2009-08-21 02:12:56.000000000 +0300
@@ -269,8 +269,8 @@ GetOptions ('h|help' => sub { $command =
'v|verbose' => sub { $verbose++; },
'n|dryrun|dry-run' => sub { $dryrun = 1; },
'V|version' => sub { $command = 'version'; },
- 's|source=i' => \@sources,
- 'p|patch=i' => \@patches,
+ 's|source=s' => \@sources,
+ 'p|patch=s' => \@patches,
'S|sources' => sub { push @what, 'sources'; },
'P|patches' => sub { push @what, 'patches'; },
'A|all' => sub { push @what, 'all'; },
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore 24 May 2009 21:29:51 -0000 1.17
+++ .cvsignore 21 Aug 2009 09:58:25 -0000 1.18
@@ -1,2 +1,2 @@
spectool-1.0.10.tar.bz2
-rpmdevtools-7.3.tar.lzma
+rpmdevtools-7.4.tar.xz
Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/rpmdevtools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- rpmdevtools.spec 27 Jul 2009 03:13:18 -0000 1.20
+++ rpmdevtools.spec 21 Aug 2009 09:58:25 -0000 1.21
@@ -3,25 +3,24 @@
%global spectool_version 1.0.10
Name: rpmdevtools
-Version: 7.3
-Release: 2%{?dist}
+Version: 7.4
+Release: 1%{?dist}
Summary: RPM Development Tools
Group: Development/Tools
# rpmdev-setuptree is GPLv2, everything else GPLv2+
License: GPLv2+ and GPLv2
URL: https://fedorahosted.org/rpmdevtools/
-Source0: https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.lzma
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# lzma for unpacking the tarball
-BuildRequires: lzma
# help2man, pod2man, *python for creating man pages
BuildRequires: help2man
BuildRequires: %{_bindir}/pod2man
-BuildRequires: python
+BuildRequires: python >= 2.4
BuildRequires: rpm-python
Provides: spectool = %{spectool_version}
Requires: diffutils
@@ -30,6 +29,8 @@ Requires: file
Requires: findutils
Requires: gawk
Requires: grep
+Requires: man
+Requires: python >= 2.4
Requires: rpm-build >= 4.4.2.1
Requires: rpm-python
Requires: sed
@@ -46,7 +47,7 @@ rpmdev-newspec Creates new .spec fr
rpmdev-rmdevelrpms Find (and optionally remove) "development" RPMs
rpmdev-checksig Check package signatures using alternate RPM keyring
rpminfo Print information about executables and libraries
-rpmdev-md5/sha* Display checksums of all files in an RPM package file
+rpmdev-md5/sha* Display checksums of all files in an archive file
rpmdev-vercmp RPM version comparison checker
spectool Expand and download sources and patches in specfiles
rpmdev-wipetree Erase all files within dirs created by rpmdev-setuptree
@@ -57,7 +58,10 @@ rpmdev-bumpspec Bump revision in spe
%prep
%setup -q -a 1
-cp -p spectool*/README README.spectool
+cp -p spectool-%{spectool_version}/README README.spectool
+cd spectool-%{spectool_version}
+%patch0 -p1
+cd ..
%build
@@ -70,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm 755 spectool*/spectool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 spectool-%{spectool_version}/spectool $RPM_BUILD_ROOT%{_bindir}
for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
install -dm 755 $RPM_BUILD_ROOT$dir
@@ -100,17 +104,20 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING README*
+%doc COPYING NEWS README*
%config(noreplace) %{_sysconfdir}/rpmdevtools/
%{_sysconfdir}/bash_completion.d/
%{_datadir}/rpmdevtools/
-%{_bindir}/rpm*
-%{_bindir}/spectool
+%{_bindir}/*
%ghost %{_datadir}/*emacs
-%{_mandir}/man[18]/rpm*.[18]*
+%{_mandir}/man[18]/*.[18]*
%changelog
+* Fri Aug 21 2009 Ville Skyttä <ville.skytta at iki.fi> - 7.4-1
+- Update to 7.4, fixes #215927 and #466353.
+- Patch spectool to make -s and -p to work as documented (Todd Zullinger).
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 24 May 2009 21:29:51 -0000 1.18
+++ sources 21 Aug 2009 09:58:25 -0000 1.19
@@ -1,2 +1,2 @@
d193612122f297ee4b37f1b04f605768 spectool-1.0.10.tar.bz2
-5475dc402a40356163e4a9b468f6497b rpmdevtools-7.3.tar.lzma
+8407f2e7f2037ec28ca7910fed2c3498 rpmdevtools-7.4.tar.xz
More information about the fedora-extras-commits
mailing list