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

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: rpmdevtools
+# $Id$
+NAME := rpmdevtools
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

branch

@@ -0,0 +1 @@
+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

@@ -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 @@ License:        GPL
 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 @@ rpmdev-extract      Extract various archives, "tar xvf" style
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -120,6 +123,9 @@ fi
 
 
 %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.