- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).

.cvsignore

@@ -1,2 +1,2 @@
-rpmdevtools-5.4.tar.bz2
-spectool-1.0.9.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2

branch

@@ -1 +1 @@
-F-7
+EL-5

rpmdevtools-5.3-el53-conflict.patch

@@ -0,0 +1,12 @@
+diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker
+--- rpmdevtools-5.3/check-rpaths-worker~	2006-08-16 01:28:09.000000000 +0300
++++ rpmdevtools-5.3/check-rpaths-worker	2009-01-01 20:23:06.000000000 +0200
+@@ -63,8 +63,6 @@ function showHint()
+ * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like
+ *   \$ RPM_BUILD_ROOT=<top-dir> /usr/lib/rpm/check-rpaths
+ *  
+-* 'check-rpaths' is part of 'rpmdevtools'.
+-*
+ *******************************************************************************
+ EOF
+ }

rpmdevtools.spec

@@ -1,17 +1,19 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.9
+%define spectool_version   1.0.8
 
 Name:           rpmdevtools
-Version:        5.4
-Release:        1%{?dist}
+Version:        5.3
+Release:        2%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://fedoraproject.org/
+URL:            http://fedora.redhat.com/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+# Avoid conflict with EL 5.3 rpm, #466939
+Patch0:         %{name}-5.3-el53-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,25 +21,10 @@ Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
 # Required for tool operations
-Requires:       rpm-python
-Requires:       python
-Requires:       cpio
-Requires:       sed
-Requires:       perl
-Requires:       wget
-Requires:       file
+Requires:       rpm-python, python, cpio, sed, perl, wget, file
 # Minimal RPM build requirements
-Requires:       rpm-build
-Requires:       gcc
-Requires:       gcc-c++
-Requires:       redhat-rpm-config
-Requires:       make
-Requires:       tar
-Requires:       patch
-Requires:       diffutils
-Requires:       gzip
-Requires:       bzip2
-Requires:       unzip
+Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
+Requires:       diffutils, gzip, bzip2, unzip
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -57,6 +44,7 @@ rpmdev-extract      Extract various archives, "tar xvf" style
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -131,38 +119,12 @@ fi
 %{_bindir}/*
 %{_prefix}/lib/rpm/check-*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man[18]/rpm*.[18]*
+%{_mandir}/man?/*.*
 
 
 %changelog
-* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 5.4-1
-- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
-- The long form of the list option in rmdevelrpms is --list-only, not --list.
-
-* Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
-- Add LSB comment block to init script template.
-
-* Wed Jun 27 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Add 2-argument form for comparing EVR strings to rpmdev-vercmp
-  (available only if rpmUtils.miscutils is available).
-
-* Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Include rpmls (#213778).
-
-* Fri Jun 15 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Update spectool to 1.0.9 (#243731).
-
-* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi>
-- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
-
-* Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
-- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
-- Update URL.
-
-* Wed Nov  8 2006 Ville Skyttä <ville.skytta at iki.fi>
-- Arch-qualify output of matched packages in rmdevelrpms and allow
-  arch-qualified packages in the config file.
+* Thu Jan  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 5.3-2
+- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).
 
 * Wed Oct 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.3-1
 - Update spectool to 1.0.8, fixes #212108.

sources

@@ -1,2 +1,2 @@
-fe7e91079b7a317f531881ce0f205594  rpmdevtools-5.4.tar.bz2
-b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2