rpms/rpmdevtools/EL-5 rpmdevtools-5.3-el53-conflict.patch, NONE, 1.1 rpmdevtools.spec, 1.5, 1.6

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/rpmdevtools/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28232

Modified Files:
	rpmdevtools.spec 
Added Files:
	rpmdevtools-5.3-el53-conflict.patch 
Log Message:
* Thu Jan  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 5.3-2
- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).


rpmdevtools-5.3-el53-conflict.patch:

--- NEW FILE rpmdevtools-5.3-el53-conflict.patch ---
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
 }


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmdevtools/EL-5/rpmdevtools.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmdevtools.spec	25 Oct 2006 12:26:07 -0000	1.5
+++ rpmdevtools.spec	1 Jan 2009 18:32:15 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           rpmdevtools
 Version:        5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@
 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
@@ -42,6 +44,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -120,6 +123,9 @@
 
 
 %changelog
+* 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.